From ca692c79344e2259ecd29d3629f6301db699a52c Mon Sep 17 00:00:00 2001 From: Srivahni Date: Wed, 10 Apr 2019 22:56:18 -0700 Subject: [PATCH] Day2 configs for Prometheus and Collectd Change-Id: Iae71e408e4f766e726a028921343be39009b088f Issue-ID: ONAPARC-457 Issue-ID: ONAPARC-443 Signed-off-by: Srivahni --- vnfs/DAaaS/day2_configs/collectd/README.txt | 14 +++++++ vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml | 47 ++++++++++++++++++++++ .../DAaaS/day2_configs/collectd/replace_image.yaml | 6 +++ vnfs/DAaaS/day2_configs/prometheus/README.txt | 7 ++++ .../day2_configs/prometheus/add_remote_write.yaml | 13 ++++++ 5 files changed, 87 insertions(+) create mode 100644 vnfs/DAaaS/day2_configs/collectd/README.txt create mode 100644 vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml create mode 100644 vnfs/DAaaS/day2_configs/collectd/replace_image.yaml create mode 100644 vnfs/DAaaS/day2_configs/prometheus/README.txt create mode 100644 vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml 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 + + LogLevel info + File "/var/log/collectd.log" + Timestamp true + PrintSeverity false + + + Interval 5 + ReportByState false + ReportByCpu false + + + + Interval 30 + ValuesAbsolute false + ValuesPercentage true + + + + Port "{{ .Values.prometheus_port }}" + + + #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 -- 2.16.6