From b63b952b552e6059b81cea5b11038349a2b4ece9 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Mon, 1 Jun 2020 01:07:38 +0200
Subject: [PATCH] add loki ds

---
 .../manifests/alertmanager-tbrnt-config-secret.yaml      | 2 +-
 monitoring/manifests/grafana-dashboardDatasources.yaml   | 2 +-
 monitoring/monitoring.jsonnet                            | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
index 3bca78a..778a58a 100644
--- a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
+++ b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: monitoring
 spec:
   encryptedData:
-    alertmanager.yaml: AgAaU6FQ7B/pKqRSfNFKYOXc808/ZQnYXiAJIzX34bHmJymNeNe90c/RCEJPRrorSEsACgDVThKiU3Kbulp08Y4oJHEpJMFOf+Nb3ADMh8pqJgVC3VHuY7n+P2C6QhYBBV2f8TEPRji7/52pkdofpmyizMP4wOCL804fWpzMjZDmfE9O0U72uxD0h0BZLLavyd+UlV9cB4pDFqcZvQ0O8B/JsyL9beMX9QytUCJzibI4d5Z9KMGJbFY+iXXzFGoYfr2uQwyfMSnQ5XZukggXejyKxba3NEN8E1vAjyUof/ytx9bjTt6G69O4F8ky77iAEyYjdoOwmzQriJoWLvueSTT0o3kfI2NbUskxl7HeIvEuX7AKG3mCDxeOZBD70DhZzUpZQAxhO5DG5MtKSjWb/A8QfD7PeFot05xK4u5X4a6p7aywRsxLd8PyKEWDLGp8ozWbPqcNBH0KPZN8tuJdmic8TSVUD6Gzk33ROHdVtaECUSXhA3FVZtW8kDnW+OA/6AD4iJYkYROYg852KviCy1Q27wYR0fklZ01QzdLax5P3VanRY7KiLBECwtMXDA1HFrpirYdcgt4wyaIoFAK5sIS1kSyieN8iM1iyNwhFR2i608cMbr9SKDOJNfmA3Gv4WDdiI36zXsnQyhLnSFYk3J+rf1fsV7i/W6FWIhsj9nmzn6A3ki9EohZGkP/pZ8zZVxQ53eaBbDELlruCfL1uV/zf5xxvIhHlaASBM3tzt4zuTl7mYHvf/52VreM4NRruHk+/yIwRdd/xYfsO8BHg6EiF45Ye+R9jvzCyZG26cYJvM1XbH9VF3kVnbFkh8PXQTSonnx5AMoC0Pbgwm1C+Dtbhe5G2eOdJ2nKs3EO0PbK0iwSmuo8hkTQ+4JWf3EFzqJXshxITeiWlgsJNecT6S3fK30/cl0/zUOZ9nIID7buDdBeWuOpPJJA9yoF2mTqgCujFjxSnFjUg/2PVB1d+N/lExifkZFt0kguqdhreB2w6Ut2F2t17glIR0AROaYMd/SzWw94Kr3V6AEx/Tcly+iVf2gvUQQ5D5+hpLXF1xlzaWD2WN5Lt8eF1VtQe98+o1gNEvbIvp7moc9qbENmam6Y6HEBgyuYhd7SRzCDZPFWQvj4Y/kOpRRL6fKR8GtrjKFY+EDVOmVJBCgyeMDO1iNarX2wEFJ5whThIHX9+mLw+JnS79osOdNxPl5LQRfgaXCuYdJIM7YWPKsl8UJUriHBbziSvQAEj8Ti7rq98Fiigbl7PMg+SCy8yDHVtrw+bZLMZSsMGtQ4c0ciwGxojb8QBD5pEG8jTKXCqIbkJHnjEg0soIi6Wr3+oqBHef6lC447S2xYBkh7DWcD/2l+NSA+/Zc1T2Shm6doxLsJ0MXsgKEiZKyBsLPVIS5AJBYUtRkywzv4GDFPAeSBFGEmfImT7yXX9JhHi0ZJmsyHfFJw/JnwoIucMSeApmZrRxZJtqIfGyJOKKSOStYzWjvihBWYeB3kFdQLrz+0HACfoxjDL0Y2XZBcRd0bDgA+leiM1+ebX9CXta4tBQ9JxVt0uQ1H6W8bOEz9rfBS7/pZ4ScU2oLQB5HDBM1ymTPXnY599oi0beLTaPTHEatcuWvz4wPOonhwDfgyxsFvxHh+HoQYkqYmJIPoibIAa4xh5OeKp6jrsbxZli4Xu6lQjwqeRPPx7K+eOGau1e4T1mA2bwh6aNtqW1Q==
+    alertmanager.yaml: AgBeUOINQct0rwrGO3KYP43wY5gaZ2Ovf4UOBgzWfP5/zFeSIix0kx1BJIrjmeNwZJnnSUQiclonO3abzjm7okbYO1un6elajJtOCaK+T0yEpmxnokKqPRQkI6+RXzoTf3PYMN9IcYhGRpRardRgFgM1zvuieE+GJrLXef5AdbZ8M2fC31V9rZZ2e7NYX9Mj/r8ol7WcBGwSrui4fW0xVNiMFSR1gpHJCyvKHXqBHFnsjTuTuJjTDcSAIAnkBHbNioS26g+aoAj73mtY95hZ71jG3uAGpLjV5EDXNLgDZAEFxKoU+IiavT2pmj0ysZwMOWEIxACUSbJd9Sg6iLLtHWpayFopsrhGozcvLcOjz6dZsprxq6fbmyiKycpzvGVpVTwdnYFa8rmEuKkFlUjYrytJlyX9xykI4ZBg5pEeGzIPvmWf78dtPPGGTkqWVSWoN9N1neVEnXWafFvXcq4gXHzSn2MEgUreVrWX26CT+7N0/+Dz8MbpTGhQfDVBY8bfnDxjIBXtRaOalrxYfG+IGGVlXaKDnPdydEzZu6hBxnBcu3C1m86FcfYrRS0Op2zAKGtcKDccYhOX4dzpWaDXqTOxZP3Er8bT2bFHeotvFdzso1uamvTSmECBhFhUFfQ0GmA0rDPupi0MCA7b5jy3mGYXyrPyT8rhQ//JNfZUIqsxdNGjQZlNuJdcSJiMifQ5ZsmMMcwn7B8Pw3t1U70fgF3GfDb9a6cj7KXxsxURsOaWh56wtQaIpkP+mMVDnyPZYMB5MWbM+rZDkB1RIXDYhXdBJTOC42niqWf1rG1wGNNGg5/F9ExeC2xU80FjuIBa951P0bF/hQEi8FlVoSKq3PAR5u+T8P3w20vYdx4cr5xfWTnkMVrPa9gWgI9WDJLR/ZI8CDAtDbcIVsTOUYI6tE2+xwFe3DuO2F2kCOcnHTAs+u+hC+Erb3+P4g5Z9AehbAUzeACVL3MpffpJDp2NYkSTVqj9TTWDmuChR8n7yRCb8qOBVvPVJ0SNxqwdBjFVIoMwLbdlgoJL3gk7h8yvbZbeVJgnIoUqIgPtG7Xybv3t/FAS6UPND1mftRJIjbp3ggAraECBzvoUqkihD26nax1tKhRGD4eFARziHBd1AN+kkMA7U5gdQ1ZV6l0+kT1SAmC6GSx0oQ45ud7zGce7npTyrpUUPtDI3qo1F8vW3UxYFhTCQvYQ2AgjkZPAUQsBafgYi5PYxgt7U8v5bsde9acwgmTN6x/clmDEDqDRywTQCCyFICLlFhirElWurQBSM1iYAuZWtFA7O2RhmkKmGDgBeC24LiFjsrIpJtl980RaPmQR9IIHAWuLZgYMXUyG9tqrOoVY8CbhxVju3uIFxB8SaCKoMY9Lji0nCaQ5FFFsYgID+L8LwjYmb08gdGJ/bxrb5X1VpAbufGPcBpDKHPaDIi+97ipT4PShcD1Y1l1fzrsaAexkgz2Mj+KbCFQpWT76FDQObj57t9vsT25MCc6BLOLS/QwsOmo7sayxYITCf3uAsqIv6b6n0OMETTm9rmBzJOlI3eHxqB7WjziZosxN+tY7rW4k21E09JufhR1FoqVDJWgclqJmcw71HagMtyi5O8Kio1jI8azCEI2Q36L9LQw1nveaMWYBam6BWnV/AyVsGOLSVGP78UjKqMH5duBui6toJUSuIPSWjcWrvCiKDjDOG9AuVj7rxNZMLrTocv4SqA==
   template:
     metadata:
       creationTimestamp: null
diff --git a/monitoring/manifests/grafana-dashboardDatasources.yaml b/monitoring/manifests/grafana-dashboardDatasources.yaml
index 22d4748..59a9c46 100644
--- a/monitoring/manifests/grafana-dashboardDatasources.yaml
+++ b/monitoring/manifests/grafana-dashboardDatasources.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  datasources.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
+  datasources.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9LAogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJMb2tpIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAibG9raSIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL2xva2kubG9raTozMTAwIiwKICAgICAgICAgICAgInZlcnNpb24iOiAxCiAgICAgICAgfQogICAgXQp9
 kind: Secret
 metadata:
   name: grafana-datasources
diff --git a/monitoring/monitoring.jsonnet b/monitoring/monitoring.jsonnet
index f90f62d..403f3c5 100644
--- a/monitoring/monitoring.jsonnet
+++ b/monitoring/monitoring.jsonnet
@@ -26,6 +26,15 @@ local kp =
       },
       grafana+: {
         plugins: ['grafana-piechart-panel'],
+        datasources+: [{
+          name: 'Loki',
+          type: 'loki',
+          access: 'proxy',
+          orgId: 1,
+          url: 'http://loki.loki:3100',
+          version: 1,
+          editable: false,
+        }],
       },
     },
     alertmanager+:: {