Merge pull request #84 from openinfradev/merge_addons

merged addons and fed-addons
openinfradev · Jun 17, 2021 · 2070f27 · 2070f27
2 parents ed0fba0 + bf05ebf
commit 2070f27
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 87 deletions.
diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml
@@ -878,77 +878,6 @@ spec:
   releaseName: addons
   targetNamespace: lma
   values:
-    grafanaDashboard:
-      enabled: false
-    metricbeat:
-      enabled: false
-      loglevel: error
-    prometheusRules:
-      aggregation:
-        enabled: true
-      alert:
-        enabled: false
-    serviceMonitor:
-      processExporter:
-        enabled: true
-        interval: TO_BE_FIXED
-        selector:
-          matchLabels:
-            application: process_exporter
-            component: metrics
-            release_group: prometheus-process-exporter
-      grafana:
-        enabled: false
-      ceph:
-        enabled: false  #FIXME
-        interval: TO_BE_FIXED
-        mon_hosts: []
-      calico:
-        enabled: true
-        interval: TO_BE_FIXED
-      kubelet:
-        enabled: true
-        interval: TO_BE_FIXED
-      istio:
-        enabled: true
-        interval: TO_BE_FIXED
-      jaeger:
-        enabled: true
-        interval: TO_BE_FIXED
-      pushgateway:
-        enabled: true
-    tacoWatcher:
-      rbac:
-        create: false
-  wait: true
----
-apiVersion: helm.fluxcd.io/v1
-kind: HelmRelease
-metadata:
-  labels:
-    name: fed-addons
-  name: fed-addons
-spec:
-  helmVersion: v3
-  chart:
-    repository: https://openinfradev.github.io/helm-repo
-    name: lma-addons
-    version: 1.5.0
-  releaseName: fed-addons
-  targetNamespace: lma
-  values:
-    createNamespace: false
-    metricbeat:
-      enabled: true
-      elasticsearch:
-        host: TO_BE_FIXED
-        username: elastic
-        password: tacoword
-      kibana:
-        host: TO_BE_FIXED
-      prometheus:
-        hosts: [] # TO_BE_FIXED
-      addtionalModules: []
     grafanaDashboard:
       enabled: true
       namespace: lma
@@ -965,21 +894,42 @@ spec:
         enabled: true
     serviceMonitor:
       calico:
-        enabled: false
+        enabled: true
+        interval: TO_BE_FIXED
       processExporter:
-        enabled: false
+        enabled: true
+        interval: TO_BE_FIXED
+        selector:
+          matchLabels:
+            application: process_exporter
+            component: metrics
+            release_group: prometheus-process-exporter
+      istio:
+        enabled: true
+        interval: TO_BE_FIXED
+      jaeger:
+        enabled: true
+        interval: TO_BE_FIXED
       grafana:
         enabled: true
         interval: TO_BE_FIXED
       ceph:
-        enabled: false
+        enabled: false  #FIXME
+        interval: TO_BE_FIXED
+        mon_hosts: []
       kubeStateMetrics:
         enabled: false
       nodeExporter:
         enabled: false
       pushgateway:
-        enabled: false
+        enabled: true
+      kubelet:
+        enabled: true
+        interval: TO_BE_FIXED
       federations: [] # TO_BE_FIXED
+    metricbeat:
+      enabled: false
+      loglevel: error
     tacoWatcher:
       host: TO_BE_FIXED
       port: 32000
@@ -999,7 +949,7 @@ spec:
       url: TO_BE_FIXED
     prometheusRules:
       aggregation:
-        enabled: false
+        enabled: true
       alert:
         enabled: true
   wait: true

diff --git a/lma/base/site-values.yaml b/lma/base/site-values.yaml
@@ -144,17 +144,6 @@ charts:
     fluentbit.nodeSelector: $(nodeSelector)
 
 - name: addons
-  override:
-    serviceMonitor.processExporter.interval: $(serviceScrapeInterval)
-    serviceMonitor.ceph.interval: $(serviceScrapeInterval)
-    serviceMonitor.calico.interval: $(serviceScrapeInterval)
-    serviceMonitor.kubeStateMetrics.interval: $(serviceScrapeInterval)
-    serviceMonitor.nodeExporter.interval: $(serviceScrapeInterval)
-    serviceMonitor.kubelet.interval: $(serviceScrapeInterval)
-    serviceMonitor.istio.interval: $(serviceScrapeInterval)
-    serviceMonitor.jaeger.interval: $(serviceScrapeInterval)
-
-- name: fed-addons
   override:
     # Configure the connection from prometheus to elasticsearch (It not used)
     metricbeat.elasticsearch.host: https://eck-elasticsearch-es-http.lma.svc.$(clusterName):9200
@@ -171,6 +160,14 @@ charts:
     # Initialize the kibana index
     kibanaInit.url: http://eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
     serviceMonitor.grafana.interval: $(serviceScrapeInterval)
+    serviceMonitor.processExporter.interval: $(serviceScrapeInterval)
+    serviceMonitor.ceph.interval: $(serviceScrapeInterval)
+    serviceMonitor.calico.interval: $(serviceScrapeInterval)
+    serviceMonitor.kubeStateMetrics.interval: $(serviceScrapeInterval)
+    serviceMonitor.nodeExporter.interval: $(serviceScrapeInterval)
+    serviceMonitor.kubelet.interval: $(serviceScrapeInterval)
+    serviceMonitor.istio.interval: $(serviceScrapeInterval)
+    serviceMonitor.jaeger.interval: $(serviceScrapeInterval)
 
     # Setting the prometheus federation
     serviceMonitor.federations: