Consist label in service monitor and logging charts

**Problem:** Enable logging and monitoring in `rancher/rancher:master`, but can't see fluentd metric **Solution:** Consist label and endpoint name in `system-chart/rancher-monitoring:v0.0.2`` **Issue:** https://github.com/rancher/rancher/issues/18327 **Patch:** https://github.com/rancher/system-charts/pull/17

Consist label in service monitor and logging charts
511280c8 · Frank Mai · Craig Jellick · 767e615d · 511280c8 · 511280c8
Commit 511280c8 authored Feb 23, 2019 by Frank Mai Committed by Craig Jellick Feb 25, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 18 deletions

values.yaml ...her-monitoring/v0.0.2/charts/exporter-fluentd/values.yaml +0 -16

values.yaml charts/rancher-monitoring/v0.0.2/values.yaml +2 -2

No files found.
--- a/charts/rancher-monitoring/v0.0.2/charts/exporter-fluentd/values.yaml
+++ b/charts/rancher-monitoring/v0.0.2/charts/exporter-fluentd/values.yaml
-## CRD apiGroup
-##
-apiGroup: "monitoring.coreos.com"
-
-ports: 
-  metrics:
-    scheme: http
-    name: metrics
-    
-serviceSelectorLabels:
-  k8s-app: fluentd
-
-## Skip verification until we have resolved why the certificate validation
-## for the kubelet on API server nodes fail.
-##
-insecureSkipVerify: true
--- a/charts/rancher-monitoring/v0.0.2/values.yaml
+++ b/charts/rancher-monitoring/v0.0.2/values.yaml
@@ -135,9 +135,9 @@ exporter-fluentd:
  ports: 
    metrics:
      scheme: http
-      name: metrics
+      name: metric
  serviceSelectorLabels:
-  - "k8s-app=fluentd"
+  - "app=fluentd"
  insecureSkipVerify: true

 metric-expression-project: