add additionalScrapeJobs for prometheus (#2144)

* add additionalScrapeJobs for prometheus

Co-authored-by: Daniel Hoherd <daniel.hoherd@gmail.com>

charts/prometheus/templates/prometheus-config-configmap.yaml

@@ -723,3 +723,7 @@ data:
             regex: ([^:]+)(?::\d+)?;(\d+)
             replacement: $1:$2
             target_label: __address__
+
+    {{- with .Values.additionalScrapeJobs }}
+    {{- toYaml . | nindent 6 }}
+    {{- end }}

charts/prometheus/values.yaml

@@ -138,6 +138,23 @@ additionalAlerts:
 #     annotations:
 #       summary: "The Astronomer Helm release {{ .Release.Name }} is failing task instances {{ printf \"%.2f\" $value }}% of the time over the past 30 minutes"
 #       description: Task instances failing above threshold
+additionalScrapeJobs: {}
+# Example:
+# additionalScrapeJobs:
+#   - job_name: 'my-job'
+#     kubernetes_sd_configs:
+#       - role: endpoints
+#     relabel_configs:
+#       - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
+#         action: keep
+#         regex: true
+#       - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
+#         action: replace
+#         target_label: __scheme__
+#         regex: (https?)
+#       - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
+#         action: replace
+#
 
 # Prometheus config file remote_write stanza
 # https://prometheus.io/docs/prometheus/latest/configuration/configuration/

tests/chart_tests/test_prometheus_config_configmap.py

@@ -305,3 +305,39 @@ def assert_relabel_config_for_non_auto_generated_namesaces(self, chart):
         ]
         assert metric_relabel_config_search_result[1]["replacement"] == "$1"
         assert metric_relabel_config_search_result[1]["target_label"] == "release"
+
+    def test_additional_scrape_jobs(self, kube_version):
+        static_job = {
+            "job_name": "example-static-job",
+            "static_configs": [{"targets": ["localhost:9090"]}],
+        }
+        kubernetes_job = {
+            "job_name": "example-kubernetes-job",
+            "kubernetes_sd_configs": [
+                {
+                    "role": "endpoints",
+                    "namespaces": {"names": ["default"]},
+                }
+            ],
+        }
+        doc = render_chart(
+            kube_version=kube_version,
+            show_only=self.show_only,
+            name="astronomer",
+            values={
+                "prometheus": {
+                    "additionalScrapeJobs": [
+                        static_job,
+                        kubernetes_job,
+                    ]
+                }
+            },
+        )[0]
+        scrape_configs = yaml.safe_load(doc["data"]["config"])["scrape_configs"]
+
+        assert (
+            static_job in scrape_configs
+        ), "Static job not found in rendered ConfigMap"
+        assert (
+            kubernetes_job in scrape_configs
+        ), "Kubernetes job not found in rendered ConfigMap"