fix(exporter): correct metrics file format and ext

Rabbit-Inc · Aug 24, 2017 · 41ff9f5 · 41ff9f5
1 parent 5972d70
commit 41ff9f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/attributes/exporter.rb b/attributes/exporter.rb
@@ -22,7 +22,7 @@
 
 # Where to put the exported metrics
 default[cookbook_name]['metrics_dir'] = '/opt/prometheus_metrics'
-metrics_file = "#{node[cookbook_name]['metrics_dir']}/chronyd"
+metrics_file = "#{node[cookbook_name]['metrics_dir']}/chronyd.prom"
 
 # Systemd service unit
 default[cookbook_name]['systemd_unit'] = {

diff --git a/files/default/chrony_exporter.sh b/files/default/chrony_exporter.sh
@@ -15,11 +15,11 @@ sources_burst_offline=\
 $(echo "${activity}" | grep "return to offline" | cut -d ' '  -f1)
 
 cat <<EOF
-TYPE node_chronyd_offset_seconds gauge
+# TYPE node_chronyd_offset_seconds gauge
 node_chronyd_offset_seconds ${last_offset}
-TYPE node_chronyd_sources_total gauge
-node_chronyd_sources_total{status=online} ${sources_online}
-node_chronyd_sources_total{status=offline} ${sources_offline}
-node_chronyd_sources_total{status=burst_online} ${sources_burst_online}
-node_chronyd_sources_total{status=burst_offline} ${sources_burst_offline}
+# TYPE node_chronyd_sources_total gauge
+node_chronyd_sources_total{status="online"} ${sources_online}
+node_chronyd_sources_total{status="offline"} ${sources_offline}
+node_chronyd_sources_total{status="burst_online"} ${sources_burst_online}
+node_chronyd_sources_total{status="burst_offline"} ${sources_burst_offline}
 EOF
diff --git a/test/integration/chrony-ntp/serverspec/default_spec.rb b/test/integration/chrony-ntp/serverspec/default_spec.rb
@@ -50,15 +50,15 @@
 end
 
 (1..15).each do |try|
-  msg = 'node_chronyd_sources_total{status=online} 2'
-  cmd = "grep '#{msg}' /opt/prometheus_metrics/chronyd"
+  msg = 'node_chronyd_sources_total{status="online"} 2'
+  cmd = "grep '#{msg}' /opt/prometheus_metrics/chronyd.prom"
   result = `#{cmd} 2>&1`
   break if result.include?(msg)
   puts "Waiting for metrics chronyd …\
         Try ##{try}/15, waiting 5s"
   sleep(5)
 end
 
-describe file('/opt/prometheus_metrics/chronyd') do
-  it { should contain('node_chronyd_sources_total{status=online} 2') }
+describe file('/opt/prometheus_metrics/chronyd.prom') do
+  it { should contain('node_chronyd_sources_total{status="online"} 2') }
 end