From c9ba37614c61470a1d3378299ef08900edeceadd Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Wed, 5 Dec 2018 16:25:48 +0100 Subject: [PATCH] nginx: Munin url config is now a template to insert the server-status prefix --- CHANGELOG.md | 1 + nginx/files/munin/evolinux.nginx | 2 -- nginx/tasks/munin_graphs.yml | 2 +- nginx/templates/munin/evolinux.nginx | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 nginx/files/munin/evolinux.nginx create mode 100644 nginx/templates/munin/evolinux.nginx diff --git a/CHANGELOG.md b/CHANGELOG.md index e47f3ba1..3a62d280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release. ### Changed ### Fixed +* nginx: Munin url config is now a template to insert the server-status prefix ### Security diff --git a/nginx/files/munin/evolinux.nginx b/nginx/files/munin/evolinux.nginx deleted file mode 100644 index c505f929..00000000 --- a/nginx/files/munin/evolinux.nginx +++ /dev/null @@ -1,2 +0,0 @@ -[nginx_*] -env.url http://munin/nginx_status diff --git a/nginx/tasks/munin_graphs.yml b/nginx/tasks/munin_graphs.yml index feabbcad..470f8fd6 100644 --- a/nginx/tasks/munin_graphs.yml +++ b/nginx/tasks/munin_graphs.yml @@ -1,7 +1,7 @@ --- - name: Copy Munin config for Nginx - copy: + template: src: munin/evolinux.nginx dest: /etc/munin/plugin-conf.d/ mode: "0644" diff --git a/nginx/templates/munin/evolinux.nginx b/nginx/templates/munin/evolinux.nginx new file mode 100644 index 00000000..f58c0078 --- /dev/null +++ b/nginx/templates/munin/evolinux.nginx @@ -0,0 +1,2 @@ +[nginx_*] +env.url http://munin/nginx_status-{{ nginx_serverstatus_suffix }}