From 3d5a3e06530c1250d48f7d838c619f3bfbcd019d Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Thu, 30 May 2019 12:38:37 -0700 Subject: Refactor Distributed Analytics project structure Modified the project structure to improve maintainability and to add future CI and integration test support. Change-Id: Id30bfb1f83f23785a6b5f99e81f42f752d59c0f8 Issue-ID: ONAPARC-280 Signed-off-by: Dileep Ranganathan --- 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 deletions(-) delete mode 100644 vnfs/DAaaS/day2_configs/collectd/README.txt delete mode 100644 vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml delete mode 100644 vnfs/DAaaS/day2_configs/collectd/replace_image.yaml delete mode 100644 vnfs/DAaaS/day2_configs/prometheus/README.txt delete mode 100644 vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml (limited to 'vnfs/DAaaS/day2_configs') diff --git a/vnfs/DAaaS/day2_configs/collectd/README.txt b/vnfs/DAaaS/day2_configs/collectd/README.txt deleted file mode 100644 index e1d6e7da..00000000 --- a/vnfs/DAaaS/day2_configs/collectd/README.txt +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 9e80ce8d..00000000 --- a/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 44e66948..00000000 --- a/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 99b63fac..00000000 --- a/vnfs/DAaaS/day2_configs/prometheus/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 48af9017..00000000 --- a/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml +++ /dev/null @@ -1,13 +0,0 @@ -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 -- cgit 1.2.3-korg