commit d7d1703c44aa6b77b6c68fb6591835e7f7a2c624
author Matthias Sohn <matthias.sohn@gmail.com> Tue Mar 24 22:41:09 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 24 22:41:09 2020 +0000
tree 9e67b053be74583ce3878692e8b965a8d28d415f
parent 5d4c32212e4e7753f9d88e9ace3f20f208c10343
parent b1be26012be4401835b5495fcb7dbac5f3113f98

Merge changes I2cd9c872,I26cfd395

* changes:
  Scrape Loki metrics
  Monitor Prometheus itself

charts/prometheus/prometheus.yaml

diff --git a/charts/prometheus/prometheus.yaml b/charts/prometheus/prometheus.yaml
index 4df43f8..66ae8d8 100644
--- a/charts/prometheus/prometheus.yaml
+++ b/charts/prometheus/prometheus.yaml
@@ -1145,11 +1145,14 @@
         username: #@ gerrit.username
         password_file: #@ "/etc/secrets/.pwd_{}".format(gerrit.host)
     #@ end
-
-      # - job_name: prometheus
-      #   static_configs:
-      #     - targets:
-      #       - localhost:9090
+    - job_name: prometheus
+      static_configs:
+        - targets:
+          - localhost:9090
+    - job_name: loki
+      static_configs:
+        - targets:
+          - #@ "loki-{}.{}.svc.cluster.local:3100".format(data.values.namespace, data.values.namespace)
 
       # A scrape configuration for running Prometheus on a Kubernetes cluster.
       # This uses separate scrape configs for cluster components (i.e. API server, node)