diff --git a/configs/metrics-merger/templates/metrics-merger.yaml b/configs/metrics-merger/templates/metrics-merger.yaml index f00f7c4..2e39dbf 100644 --- a/configs/metrics-merger/templates/metrics-merger.yaml +++ b/configs/metrics-merger/templates/metrics-merger.yaml @@ -29,3 +29,4 @@ spec: args: - {{ .Values.prometheusServiceUrl }} - {{ .Values.pushgatewayURL }} + - {{ .Values.exportedJobs }} diff --git a/configs/metrics-merger/values.yaml b/configs/metrics-merger/values.yaml index 31433c0..88f73fb 100644 --- a/configs/metrics-merger/values.yaml +++ b/configs/metrics-merger/values.yaml @@ -1,2 +1,3 @@ prometheusServiceUrl: "http://prometheus-operator-kube-p-prometheus.monitoring:9090" pushgatewayURL: "pushgateway.monitoring:9091" +exportedJobs: "bare-metal,svcmesh-linkerd,svcmesh-istio" diff --git a/metrics-merger/merger.py b/metrics-merger/merger.py index da19e8a..f477481 100644 --- a/metrics-merger/merger.py +++ b/metrics-merger/merger.py @@ -148,9 +148,9 @@ def create_summary_gauge(p, mesh, r, detailed=False, past_days=7): if 3 > len(argv): print( - 'Command line error: Prometheus URL and push gateway are required.') + 'Command line error: Prometheus URL and push gateway, and list of exported_jobs are required.') print('Usage:') - print(' %s []' + print(' %s [,[,...]] []' % (argv[0],)) exit(1) @@ -158,13 +158,15 @@ def create_summary_gauge(p, mesh, r, detailed=False, past_days=7): pgw_url = argv[2] past_days=7 -if 4 == len(argv): +exported_jobs = argv[3].split(",") + +if 5 == len(argv): past_days=int(argv[3]) environ['PROMETHEUS_URL'] = prometheus_url p = Prometheus() -for mesh in ["bare-metal", "svcmesh-linkerd", "svcmesh-istio"]: +for mesh in exported_jobs: r = CollectorRegistry() workaround = mesh