Enssure we wait for the grafana server to be fully started

diff --git a/cookbooks/prometheus/metadata.rb b/cookbooks/prometheus/metadata.rb
index e3f4dc4d58fa507d59f19caee1a825351524c656..25ff3d821606cfd91f45c4e338520491cc7a2d6d 100644 (file)
--- a/cookbooks/prometheus/metadata.rb
+++ b/cookbooks/prometheus/metadata.rb
@@ -11,3 +11,5 @@ depends           "apt"
 depends           "awscli"
 depends           "hardware"
 depends           "networking"
 depends           "awscli"
 depends           "hardware"
 depends           "networking"

+depends           "systemd"
+depends           "tools"

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 81d00b98c5faac4baafd5be3c7f4b9ad084e1061..4b75de5032abf8ffd67bb48f43249998ab209b1a 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "apt::grafana"
 include_recipe "awscli"
 include_recipe "networking"
 include_recipe "apt::grafana"
 include_recipe "awscli"
 include_recipe "networking"

+include_recipe "tools"

 
 passwords = data_bag_item("prometheus", "passwords")
 tokens = data_bag_item("prometheus", "tokens")
 
 passwords = data_bag_item("prometheus", "passwords")
 tokens = data_bag_item("prometheus", "tokens")


@@ -355,6 +356,12 @@ template "/etc/grafana/grafana.ini" do
   variables :passwords => passwords
 end
 
   variables :passwords => passwords
 end
 

+systemd_service "grafana-server-wait-for-port" do
+  service "grafana-server"
+  dropin "wait-for-port"
+  exec_start_post "/usr/local/bin/wait-for-port 3000"
+end
+

 service "grafana-server" do
   action [:enable, :start]
   subscribes :restart, "template[/etc/grafana/grafana.ini]"
 service "grafana-server" do
   action [:enable, :start]
   subscribes :restart, "template[/etc/grafana/grafana.ini]"

diff --git a/cookbooks/tools/files/default/local-bin/wait-for-port b/cookbooks/tools/files/default/local-bin/wait-for-port
new file mode 100755 (executable)
index 0000000..cd4db79
--- /dev/null
+++ b/cookbooks/tools/files/default/local-bin/wait-for-port
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while [ -z "$(ss -Htl sport = :$1)" ]
+do
+  sleep 1
+done

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index a51879e67a0302d8b2031d20264e70d1dc78e43e..a0729afeacded063553f18a1b551b1a57a003666 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -51,6 +51,17 @@ service "rsyslog" do
   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

+# Install some common tools
+remote_directory "/usr/local/bin" do
+  source "local-bin"
+  owner "root"
+  group "root"
+  mode "755"
+  files_owner "root"
+  files_group "root"
+  files_mode "755"
+end
+

 # Remove some unused and unwanted packages
 package %w[mlocate whoopsie] do
   action :purge
 # Remove some unused and unwanted packages
 package %w[mlocate whoopsie] do
   action :purge