Merge pull request #52 from openinfradev/TACODEV-798

TACODEV-798: remove fed-master
openinfradev · Aug 2, 2021 · 9e1cdcb · 9e1cdcb
2 parents cdfaec6 + 74ac4a0
commit 9e1cdcb
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/hanu-reference/lma/site-values.yaml b/hanu-reference/lma/site-values.yaml
@@ -27,22 +27,17 @@ charts:
     kubeEtcd.endpoints:
     - 172.27.1.222
     prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.storageClassName: $(storageClassName)
-    prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.resources.requests.storage: 10Gi
+    prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.resources.requests.storage: 20Gi
     prometheus.prometheusSpec.retention: 2d
     prometheus.prometheusSpec.externalLabels.taco_cluster: dev
     prometheus.prometheusSpec.nodeSelector: $(nodeSelector)
 
-- name: prometheus-fed-master
-  override:
     alertmanager.service.type: NodePort
     alertmanager.service.nodePort: 30111
     alertmanager.alertmanagerSpec.alertmanagerConfigSelector.matchLabels.alertmanagerConfig: example
     alertmanager.alertmanagerSpec.nodeSelector: $(nodeSelector)
     alertmanager.alertmanagerSpec.retention: 2h
     alertmanager.config.global.slack_api_url: https://hooks.slack.com/services/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
-    prometheus.prometheusSpec.nodeSelector: $(nodeSelector)
-    prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.storageClassName: $(storageClassName)
-    prometheus.prometheusSpec.storageSpec.volumeClaimTemplate.spec.resources.requests.storage: 20Gi
 
 - name: prometheus-node-exporter  
 
@@ -133,14 +128,6 @@ charts:
     serviceMonitor.kubelet.interval: 30s
     serviceMonitor.additionalScrapeConfigs:
     metricbeat.enabled: false
-    metricbeat.elasticsearch.host: https://eck-elasticsearch-es-http.lma.svc.$(clusterName):9200
-    metricbeat.kibana.host: eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
-    metricbeat.prometheus.hosts:
-    - fed-master-prometheus.lma.svc.$(clusterName):9090
-    # tacoWatcher.host: taco-watcher.lma.svc.$(clusterName)
-    # tacoWatcher.joinCluster.body.kibanaUrl: http://eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
-    # tacoWatcher.joinCluster.body.grafanaUrl: http://grafana.lma.svc.$(clusterName)
-    # tacoWatcher.joinCluster.body.k8sUrl: https://kubernetes.default.svc.$(clusterName)
     kibanaInit.url: http://eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
 
 - name: prometheus-adapter