Merge "Day2 configs for Prometheus and Collectd"

5 files changed, 87 insertions, 0 deletions

diff --git a/vnfs/DAaaS/day2_configs/collectd/README.txt b/vnfs/DAaaS/day2_configs/collectd/README.txt
new file mode 100644
index 00000000..e1d6e7da
--- /dev/null
+++ b/vnfs/DAaaS/day2_configs/collectd/README.txt
@@ -0,0 +1,14 @@
+Assuming initial/day0 config in namespace "edge1" and helm release name as "cp" (helm install -n cp collection/ --namespace=edge1)
+
+*******************Day2 config (add more plugins)
+This day2 config adds cpu, memory and cpufreq plugins to existing config
+
+Run below commands to apply day2 config
+
+1. kubectl patch --namespace=edge1 configmaps cp-collectd-config -p "$(cat add_plugins.yaml)"
+
+2. Restart pods: kubectl delete pods --namespace=edge1 cp-collectd-db7mf cp-collectd-pfc9t cp-collectd-sqjvq
+
+
+************Day3 config (replace image being used)
+1. kubectl patch --namespace=edge1 daemonset cp-collectd -p "$(cat replace_image.yaml)"
diff --git a/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml b/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml
new file mode 100644
index 00000000..9e80ce8d
--- /dev/null
+++ b/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml
@@ -0,0 +1,47 @@
+data:
+  node-collectd.conf: |-
+    FQDNLookup false
+
+    LoadPlugin cpu
+    LoadPlugin memory
+    LoadPlugin cpufreq
+    LoadPlugin disk
+    LoadPlugin ethstat
+    LoadPlugin ipc
+    LoadPlugin ipmi
+    LoadPlugin load
+    LoadPlugin numa
+    LoadPlugin processes
+    LoadPlugin df
+    LoadPlugin turbostat
+    LoadPlugin uptime
+    LoadPlugin contextswitch
+    LoadPlugin irq
+    LoadPlugin df
+    LoadPlugin swap
+    LoadPlugin write_prometheus
+
+    LoadPlugin logfile
+    <Plugin logfile>
+      LogLevel info
+      File "/var/log/collectd.log"
+      Timestamp true
+      PrintSeverity false
+    </Plugin>
+    <Plugin "cpu">
+      Interval 5
+      ReportByState false
+      ReportByCpu false
+    </Plugin>
+
+    <Plugin "memory">
+      Interval 30
+      ValuesAbsolute false
+      ValuesPercentage true
+    </Plugin>
+
+    <Plugin "write_prometheus">
+     Port "{{ .Values.prometheus_port }}"
+    </Plugin>
+
+    #Last line (collectd requires ‘\n’ at the last line)
diff --git a/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml b/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml
new file mode 100644
index 00000000..44e66948
--- /dev/null
+++ b/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml
@@ -0,0 +1,6 @@
+spec:
+  template:
+    spec:
+      containers:
+        - name: collectd
+          image: "opnfv/barometer-collectd:stable"
diff --git a/vnfs/DAaaS/day2_configs/prometheus/README.txt b/vnfs/DAaaS/day2_configs/prometheus/README.txt
new file mode 100644
index 00000000..99b63fac
--- /dev/null
+++ b/vnfs/DAaaS/day2_configs/prometheus/README.txt
@@ -0,0 +1,7 @@
+This day2 config adds a remote_write to existing config
+
+Assuming initial/day0 config in namespace "edge1" and helm release name as "cp" (helm install -n cp collection/ --namespace=edge1)
+
+Run below command to apply day2 config
+
+kubectl patch --namespace=edge1 prometheus cp-prometheus-prometheus -p "$(cat add_remote_write.yaml)" --type=merge
diff --git a/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml b/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml
new file mode 100644
index 00000000..48af9017
--- /dev/null
+++ b/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml
@@ -0,0 +1,13 @@
+spec:
+  remoteRead:
+  - url: "http://m3coordinator-m3db.m3db-operator.svc.cluster.local:7201/api/v1/prom/remote/read"
+    readRecent: true
+  remoteWrite:
+  - url: "http://m3coordinator-m3db.m3db-operator.svc.cluster.local:7201/api/v1/prom/remote/write"
+    writeRelabelConfigs:
+      - targetLabel: metrics_storage
+        replacement: m3db_remote
+  - url: "http://m3coordinator-m3db-cluster.edge1.svc.cluster.local:7201/api/v1/prom/remote/write"
+    writeRelabelConfigs:
+      - targetLabel: metrics_storage_day2
+        replacement: m3db_remote_day2