update configmaps according to moira/#482

Moved pprof and metrics configs to telemetry section
moira-alert · Feb 26, 2020 · 0a30f2c · 0a30f2c
1 parent ecaabd1
commit 0a30f2c
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 35 deletions.
diff --git a/charts/moira/templates/api-configmap.yaml b/charts/moira/templates/api-configmap.yaml
@@ -34,14 +34,16 @@ data:
       check_interval: {{ .Values.datasources.remote.checkInterval }}
       user: {{ .Values.datasources.remote.user }}
       password: {{ .Values.datasources.remote.password }}
-    graphite:
-      enabled: {{ .Values.monitoring.graphite.enabled }}
-      uri: {{ .Values.monitoring.graphite.uri }}
-      interval: {{ .Values.monitoring.graphite.interval }}
-      prefix: {{ .Values.monitoring.graphite.prefix }}
-      runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
     logger:
       log_level: {{ .Values.monitoring.logger.logLevel }}
       log_file: {{ .Values.monitoring.logger.logFile }}
-    pprof:
-      listen: {{ .Values.monitoring.pprof.listen }}
+    telemetry:
+      listen: {{ .Values.monitoring.listen }}
+      graphite:
+        enabled: {{ .Values.monitoring.graphite.enabled }}
+        uri: {{ .Values.monitoring.graphite.uri }}
+        interval: {{ .Values.monitoring.graphite.interval }}
+        prefix: {{ .Values.monitoring.graphite.prefix }}
+        runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
+      pprof: 
+        enabled: {{ .Values.monitoring.pprof.enabled }}
diff --git a/charts/moira/templates/checker-configmap.yaml b/charts/moira/templates/checker-configmap.yaml
@@ -30,14 +30,16 @@ data:
       check_interval: {{ .Values.datasources.remote.checkInterval }}
       user: {{ .Values.datasources.remote.user }}
       password: {{ .Values.datasources.remote.password }}
-    graphite:
-      enabled: {{ .Values.monitoring.graphite.enabled }}
-      uri: {{ .Values.monitoring.graphite.uri }}
-      interval: {{ .Values.monitoring.graphite.interval }}
-      prefix: {{ .Values.monitoring.graphite.prefix }}
-      runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
     logger:
       log_level: {{ .Values.monitoring.logger.logLevel }}
       log_file: {{ .Values.monitoring.logger.logFile }}
-    pprof:
-      listen: {{ .Values.monitoring.pprof.listen }}
+    telemetry:
+      listen: {{ .Values.monitoring.listen }}
+      graphite:
+        enabled: {{ .Values.monitoring.graphite.enabled }}
+        uri: {{ .Values.monitoring.graphite.uri }}
+        interval: {{ .Values.monitoring.graphite.interval }}
+        prefix: {{ .Values.monitoring.graphite.prefix }}
+        runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
+      pprof: 
+        enabled: {{ .Values.monitoring.pprof.enabled }}
diff --git a/charts/moira/templates/filter-configmap.yaml b/charts/moira/templates/filter-configmap.yaml
@@ -19,16 +19,19 @@ data:
       port: {{ .Values.datasources.redis.port }}
       dbid: {{ .Values.datasources.redis.db }}
       connection_limit: {{ .Values.datasources.redis.connectionLimit }}
-    graphite:
-      enabled: {{ .Values.monitoring.graphite.enabled }}
-      uri: {{ .Values.monitoring.graphite.uri }}
-      interval: {{ .Values.monitoring.graphite.interval }}
-      prefix: {{ .Values.monitoring.graphite.prefix }}
-      runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
     logger:
       log_level: {{ .Values.monitoring.logger.logLevel }}
       log_file: {{ .Values.monitoring.logger.logFile }}
-    pprof:
-      listen: {{ .Values.monitoring.pprof.listen }}
+    telemetry:
+      listen: {{ .Values.monitoring.listen }}
+      graphite:
+        enabled: {{ .Values.monitoring.graphite.enabled }}
+        uri: {{ .Values.monitoring.graphite.uri }}
+        interval: {{ .Values.monitoring.graphite.interval }}
+        prefix: {{ .Values.monitoring.graphite.prefix }}
+        runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
+      pprof: 
+        enabled: {{ .Values.monitoring.pprof.enabled }}
+        
   storage-schemas.conf: |
 {{ .Values.microservices.filter.retentionConfig | indent 4 }}
diff --git a/charts/moira/templates/notifier-configmap.yaml b/charts/moira/templates/notifier-configmap.yaml
@@ -50,14 +50,16 @@ data:
       check_interval: {{ .Values.datasources.remote.checkInterval }}
       user: {{ .Values.datasources.remote.user }}
       password: {{ .Values.datasources.remote.password }}
-    graphite:
-      enabled: {{ .Values.monitoring.graphite.enabled }}
-      uri: {{ .Values.monitoring.graphite.uri }}
-      interval: {{ .Values.monitoring.graphite.interval }}
-      prefix: {{ .Values.monitoring.graphite.prefix }}
-      runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
     logger:
       log_level: {{ .Values.monitoring.logger.logLevel }}
       log_file: {{ .Values.monitoring.logger.logFile }}
-    pprof:
-      listen: {{ .Values.monitoring.pprof.listen }}
+    telemetry:
+      listen: {{ .Values.monitoring.listen }}
+      graphite:
+        enabled: {{ .Values.monitoring.graphite.enabled }}
+        uri: {{ .Values.monitoring.graphite.uri }}
+        interval: {{ .Values.monitoring.graphite.interval }}
+        prefix: {{ .Values.monitoring.graphite.prefix }}
+        runtime_stats: {{ .Values.monitoring.graphite.runtimeStats }}
+      pprof: 
+        enabled: {{ .Values.monitoring.pprof.enabled }}
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 entries:
   moira:
   - apiVersion: v1
-    created: "2019-09-09T13:11:27.065670199+05:00"
+    created: "2020-02-26T14:43:50.4305515+05:00"
     description: Moira is a real-time alerting tool, based on Graphite data.
-    digest: 7365191ea3a6f6f446921b3f50cacd52e45e67092788f98189dd40f11af205ad
+    digest: a0e3dc6ef89aacd4191987d8a4edbba66c928857cd088eab00469d7b00e44b81
     home: https://moira.readthedocs.io
     icon: https://avatars1.githubusercontent.com/u/15890491
     keywords:
@@ -25,4 +25,4 @@ entries:
     urls:
     - https://moira-alert.github.io/helmcharts/moira-2.6.0.tgz
     version: 2.6.0
-generated: "2019-09-09T13:11:27.064603194+05:00"
+generated: "2020-02-26T14:43:50.4245505+05:00"
diff --git a/docs/moira-2.6.0.tgz b/docs/moira-2.6.0.tgz