From 06438d0dc2483398edc8b33c5e15215d9064549c Mon Sep 17 00:00:00 2001
From: Kazuhiro MUSASHI <simoom634@yahoo.co.jp>
Date: Sat, 26 Sep 2020 17:33:23 +0900
Subject: [PATCH 1/2] Collect the metrics from `grafana`.

---
 cookbooks/prometheus/files/etc/prometheus.d/prometheus.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cookbooks/prometheus/files/etc/prometheus.d/prometheus.yml b/cookbooks/prometheus/files/etc/prometheus.d/prometheus.yml
index e1d1873..df63eec 100644
--- a/cookbooks/prometheus/files/etc/prometheus.d/prometheus.yml
+++ b/cookbooks/prometheus/files/etc/prometheus.d/prometheus.yml
@@ -51,6 +51,12 @@ scrape_configs:
       services:
         - 'node_exporter'
 
+  - job_name: 'grafana'
+    consul_sd_configs:
+    - server: 'localhost:8500'
+      services:
+        - 'grafana'
+
 alerting:
   alertmanagers:
     - static_configs:

From e8d8ceeacbfa9694df9493ffcbcf263ea25cde16 Mon Sep 17 00:00:00 2001
From: Kazuhiro MUSASHI <simoom634@yahoo.co.jp>
Date: Sat, 26 Sep 2020 17:34:59 +0900
Subject: [PATCH 2/2] Deploy the `consul` config for `Grafana`.

---
 .../grafana/files/etc/consul.d/service-grafana.json      | 6 ++++++
 cookbooks/grafana/setup.rb                               | 9 +++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 cookbooks/grafana/files/etc/consul.d/service-grafana.json

diff --git a/cookbooks/grafana/files/etc/consul.d/service-grafana.json b/cookbooks/grafana/files/etc/consul.d/service-grafana.json
new file mode 100644
index 0000000..b535c68
--- /dev/null
+++ b/cookbooks/grafana/files/etc/consul.d/service-grafana.json
@@ -0,0 +1,6 @@
+{
+  "service": {
+    "name": "grafana",
+    "port": 3000
+  }
+}
diff --git a/cookbooks/grafana/setup.rb b/cookbooks/grafana/setup.rb
index e1f402a..f4bc26e 100644
--- a/cookbooks/grafana/setup.rb
+++ b/cookbooks/grafana/setup.rb
@@ -3,6 +3,15 @@ service 'grafana-server' do
   action [ :enable, :start ]
 end
 
+# Deploy `consul` config for `grafana`:
+remote_file '/etc/consul.d/service-grafana.json' do
+  owner 'root'
+  group 'root'
+  mode '644'
+
+  notifies :restart, 'service[supervisor]'
+end
+
 # Firewall settings here:
 %w( 3000/tcp ).each do |p|
   execute "ufw allow #{p}" do