From 648027d09aea42101ce964a312219a4b5051432b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 17 Sep 2020 18:23:17 +0000
Subject: [PATCH] Enable NTP collector for prometheus node exporter

---
 cookbooks/ntp/templates/default/chrony.conf.erb     | 4 ++++
 cookbooks/prometheus/recipes/default.rb             | 1 +
 cookbooks/prometheus/resources/exporter.rb          | 1 +
 cookbooks/prometheus/templates/default/defaults.erb | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cookbooks/ntp/templates/default/chrony.conf.erb b/cookbooks/ntp/templates/default/chrony.conf.erb
index 9fc9393bc..03728fddb 100644
--- a/cookbooks/ntp/templates/default/chrony.conf.erb
+++ b/cookbooks/ntp/templates/default/chrony.conf.erb
@@ -9,6 +9,10 @@ pool <%= server %> iburst
 pool time.cloudflare.com iburst
 pool time.google.com iburst
 
+# Allow local queries for monitoring
+allow 127.0.0.1/32
+allow ::1/128
+
 # Run an initial NTP sync on daemon startup
 initstepslew 30 time.cloudflare.com time.google.com <%= node[:ntp][:servers].join(" ") %>
 
diff --git a/cookbooks/prometheus/recipes/default.rb b/cookbooks/prometheus/recipes/default.rb
index ad0a95a0a..f657b9990 100644
--- a/cookbooks/prometheus/recipes/default.rb
+++ b/cookbooks/prometheus/recipes/default.rb
@@ -41,4 +41,5 @@ end
 prometheus_exporter "node" do
   port 9100
   package_options "--no-install-recommends"
+  exporter_options "--collector.ntp"
 end
diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index e740ac79e..8dd928846 100644
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -22,6 +22,7 @@ default_action :create
 property :exporter, :kind_of => String, :name_property => true
 property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"
+property :exporter_options, :kind_of => [String, Array]
 property :package, :kind_of => String
 property :package_options, :kind_of => String
 property :defaults, :kind_of => String
diff --git a/cookbooks/prometheus/templates/default/defaults.erb b/cookbooks/prometheus/templates/default/defaults.erb
index 3760c99f7..c73c52e9a 100644
--- a/cookbooks/prometheus/templates/default/defaults.erb
+++ b/cookbooks/prometheus/templates/default/defaults.erb
@@ -1,3 +1,3 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-ARGS="--<%= @listen_switch %>=<%= @listen_address %>"
+ARGS="--<%= @listen_switch %>=<%= @listen_address %> <%= Array(@exporter_options).join(" ") %>"
-- 
2.39.5