From 90816998882ea262bf7453e0b425bf4fb7182d35 Mon Sep 17 00:00:00 2001 From: Robert Hecht Date: Mon, 27 Jun 2016 16:39:40 +0200 Subject: [PATCH 1/2] made graph_strategy configurable --- README.md | 1 + defaults/main.yml | 1 + templates/munin.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 404c853..5ba5bda 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Available variables are listed below, along with default values (see `defaults/m Some default locations for Munin-generated files, configurations, logs, etc. munin_html_strategy: cron + munin_cgi_strategy: cron munin_max_processes: 12 See the official Munin documentation for [munin.conf](http://munin.readthedocs.org/en/latest/reference/munin.conf.html) for more information on these and other optional directives. diff --git a/defaults/main.yml b/defaults/main.yml index 379b826..34b8880 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,6 +13,7 @@ munin_rundir: /var/run/munin munin_includedir: /etc/munin/conf.d munin_html_strategy: cron +munin_cgi_strategy: cron munin_cron_job: present munin_max_processes: 12 diff --git a/templates/munin.conf.j2 b/templates/munin.conf.j2 index 9327f92..1610d87 100644 --- a/templates/munin.conf.j2 +++ b/templates/munin.conf.j2 @@ -29,7 +29,7 @@ includedir {{ munin_includedir }} # documentation. # Since 2.0, munin-graph has been rewritten to use the cgi code. # It is single threaded *by design* now. -graph_strategy cron +graph_strategy {{ munin_cgi_strategy }} # munin-cgi-graph is invoked by the web server up to very many times at the # same time. This is not optimal since it results in high CPU and memory From 6b7f08b9d6002b0ca75cca9bee1f23520b581590 Mon Sep 17 00:00:00 2001 From: Robert Hecht Date: Mon, 27 Jun 2016 17:59:18 +0200 Subject: [PATCH 2/2] fixed copy paste error munin_cgi_strategy to munin_graph_strategy --- README.md | 2 +- defaults/main.yml | 2 +- templates/munin.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5ba5bda..0ac4666 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Available variables are listed below, along with default values (see `defaults/m Some default locations for Munin-generated files, configurations, logs, etc. munin_html_strategy: cron - munin_cgi_strategy: cron + munin_graph_strategy: cron munin_max_processes: 12 See the official Munin documentation for [munin.conf](http://munin.readthedocs.org/en/latest/reference/munin.conf.html) for more information on these and other optional directives. diff --git a/defaults/main.yml b/defaults/main.yml index 34b8880..338e5a4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,7 +13,7 @@ munin_rundir: /var/run/munin munin_includedir: /etc/munin/conf.d munin_html_strategy: cron -munin_cgi_strategy: cron +munin_graph_strategy: cron munin_cron_job: present munin_max_processes: 12 diff --git a/templates/munin.conf.j2 b/templates/munin.conf.j2 index 1610d87..875c4c9 100644 --- a/templates/munin.conf.j2 +++ b/templates/munin.conf.j2 @@ -29,7 +29,7 @@ includedir {{ munin_includedir }} # documentation. # Since 2.0, munin-graph has been rewritten to use the cgi code. # It is single threaded *by design* now. -graph_strategy {{ munin_cgi_strategy }} +graph_strategy {{ munin_graph_strategy }} # munin-cgi-graph is invoked by the web server up to very many times at the # same time. This is not optimal since it results in high CPU and memory