From c223993eba487cc24425890b2b9b6abd2f6c4d35 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Sun, 31 May 2009 21:18:22 +0200 Subject: adapt to new "common" module --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README') diff --git a/README b/README index 762a802..18cfa0a 100644 --- a/README +++ b/README @@ -37,9 +37,9 @@ To use this module, follow these directions: c. you will also need to create the following empty directories: mkdir /etc/puppet/modules/munin/files/empty - mkdir /etc/puppet/modules/munin/files/modules_dir - mkdir -p /etc/puppet/modules/munin/files/nodes/modules_dir - mkdir -p /etc/puppet/modules/munin/files/plugins/modules_dir + mkdir /etc/puppet/modules/munin/files/module_dir + mkdir -p /etc/puppet/modules/munin/files/nodes/module_dir + mkdir -p /etc/puppet/modules/munin/files/plugins/module_dir d. Add to the top of your site.pp a variable which indicates what IP should be allowed to connect to your individual munin-nodes (this is typically your main munin host's IP): -- cgit v1.2.3 From c0abb341bfdd1061c85d0349b9a880de6047728f Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 3 Jun 2009 11:11:45 +0200 Subject: use cidr_allow in lenny and newer This change keeps munin_allow for etch and feisty, since I don't know whether cidr_allow is already possible there. Everyone else should change to the much nicer CIDR notation of cidr_allow. You can use an array to specify multiple rules. --- README | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'README') diff --git a/README b/README index 18cfa0a..8352db0 100644 --- a/README +++ b/README @@ -44,7 +44,13 @@ To use this module, follow these directions: d. Add to the top of your site.pp a variable which indicates what IP should be allowed to connect to your individual munin-nodes (this is typically your main munin host's IP): - $munin_allow = '192.168.0.1' + $munin_cidr_allow = '192.168.0.1/32' + + You can also put an array there. + + On pre-lenny systems, you have to use the older Regexp-variant: + + $munin_allow = '^192\.168\.0\.1$' e. In the node definition in your site.pp for your main munin host, add the following: -- cgit v1.2.3 From 23dc1202b2e30355e1f45f7be882f65db8477053 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 3 Jun 2009 11:38:08 +0200 Subject: Add initialisation for munin.conf.header --- README | 3 +++ 1 file changed, 3 insertions(+) (limited to 'README') diff --git a/README b/README index 8352db0..80d0408 100644 --- a/README +++ b/README @@ -87,3 +87,6 @@ To use this module, follow these directions: $munin_port = 4948 +4. Cleanup: If you need any manual configuration or had already nodes defined + in your munin.conf, you can add/remove them from + /etc/munin/munin.conf.header on the munin::host. -- cgit v1.2.3 From 1868c2508f01c6b85f9086ddac00998521067fbc Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Thu, 4 Jun 2009 11:15:43 +0200 Subject: Remove superfluous modules_dir/.ignore and fix README --- README | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'README') diff --git a/README b/README index 80d0408..55bff26 100644 --- a/README +++ b/README @@ -34,14 +34,7 @@ To use this module, follow these directions: "modules.pp" in your site.pp, if you do not have that, then you will need to add the import line to your site.pp) - c. you will also need to create the following empty directories: - - mkdir /etc/puppet/modules/munin/files/empty - mkdir /etc/puppet/modules/munin/files/module_dir - mkdir -p /etc/puppet/modules/munin/files/nodes/module_dir - mkdir -p /etc/puppet/modules/munin/files/plugins/module_dir - - d. Add to the top of your site.pp a variable which indicates what IP should be allowed to + c. Add to the top of your site.pp a variable which indicates what IP should be allowed to connect to your individual munin-nodes (this is typically your main munin host's IP): $munin_cidr_allow = '192.168.0.1/32' @@ -52,16 +45,16 @@ To use this module, follow these directions: $munin_allow = '^192\.168\.0\.1$' - e. In the node definition in your site.pp for your main munin host, add the following: + d. In the node definition in your site.pp for your main munin host, add the following: include munin::host - f. On each node that will gather munin statistics, add this line to that node's entry + e. On each node that will gather munin statistics, add this line to that node's entry in site.pp (you may want to also add this to your main munin host): include munin::client - g. If there are particular munin plugins you want to enable or configure, you define them + f. If there are particular munin plugins you want to enable or configure, you define them in the node definition, like follows: # Enable monitoring of disk stats in bytes @@ -81,7 +74,7 @@ To use this module, follow these directions: } - h. If you have Linux-Vservers configured, you will likely have multiple munin-node processes + g. If you have Linux-Vservers configured, you will likely have multiple munin-node processes competing for the default port 4949, for those nodes, set an alternate port for munin-node to run on by putting something similar to the following in the node definition: -- cgit v1.2.3 From b46b64fa416d82c4a305463c02731d2da4a54879 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 23 Nov 2009 12:17:37 -0500 Subject: some clarifications to README for those who do not have the empty directories --- README | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'README') diff --git a/README b/README index 55bff26..762a802 100644 --- a/README +++ b/README @@ -34,27 +34,28 @@ To use this module, follow these directions: "modules.pp" in your site.pp, if you do not have that, then you will need to add the import line to your site.pp) - c. Add to the top of your site.pp a variable which indicates what IP should be allowed to - connect to your individual munin-nodes (this is typically your main munin host's IP): - - $munin_cidr_allow = '192.168.0.1/32' + c. you will also need to create the following empty directories: - You can also put an array there. + mkdir /etc/puppet/modules/munin/files/empty + mkdir /etc/puppet/modules/munin/files/modules_dir + mkdir -p /etc/puppet/modules/munin/files/nodes/modules_dir + mkdir -p /etc/puppet/modules/munin/files/plugins/modules_dir - On pre-lenny systems, you have to use the older Regexp-variant: + d. Add to the top of your site.pp a variable which indicates what IP should be allowed to + connect to your individual munin-nodes (this is typically your main munin host's IP): - $munin_allow = '^192\.168\.0\.1$' + $munin_allow = '192.168.0.1' - d. In the node definition in your site.pp for your main munin host, add the following: + e. In the node definition in your site.pp for your main munin host, add the following: include munin::host - e. On each node that will gather munin statistics, add this line to that node's entry + f. On each node that will gather munin statistics, add this line to that node's entry in site.pp (you may want to also add this to your main munin host): include munin::client - f. If there are particular munin plugins you want to enable or configure, you define them + g. If there are particular munin plugins you want to enable or configure, you define them in the node definition, like follows: # Enable monitoring of disk stats in bytes @@ -74,12 +75,9 @@ To use this module, follow these directions: } - g. If you have Linux-Vservers configured, you will likely have multiple munin-node processes + h. If you have Linux-Vservers configured, you will likely have multiple munin-node processes competing for the default port 4949, for those nodes, set an alternate port for munin-node to run on by putting something similar to the following in the node definition: $munin_port = 4948 -4. Cleanup: If you need any manual configuration or had already nodes defined - in your munin.conf, you can add/remove them from - /etc/munin/munin.conf.header on the munin::host. -- cgit v1.2.3 From 35982d28049064b3ef36dc7377070c8ada6410ce Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 23 Nov 2009 12:32:03 -0500 Subject: adjust README to note the new munin_cidr_allow variable --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'README') diff --git a/README b/README index 762a802..c0872f0 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ - Munin is a performance monitoring system which creates nice RRD graphs and has a very easy plugin interface. The munin homepage is http://munin.projects.linpro.no/ @@ -44,7 +43,7 @@ To use this module, follow these directions: d. Add to the top of your site.pp a variable which indicates what IP should be allowed to connect to your individual munin-nodes (this is typically your main munin host's IP): - $munin_allow = '192.168.0.1' + $munin_cidr_allow = '192.168.0.1' e. In the node definition in your site.pp for your main munin host, add the following: -- cgit v1.2.3 From ff66ccb14f738dd0f6f95bf2d9406874d3edb4c8 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 23 Nov 2009 12:41:05 -0500 Subject: fixup the README so it includes DavidS' changes for the munin_cidr_allow information: * add back the cidr notation to the example variable * add back the information about pre-lenny versions --- README | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'README') diff --git a/README b/README index c0872f0..c79cdf0 100644 --- a/README +++ b/README @@ -43,7 +43,13 @@ To use this module, follow these directions: d. Add to the top of your site.pp a variable which indicates what IP should be allowed to connect to your individual munin-nodes (this is typically your main munin host's IP): - $munin_cidr_allow = '192.168.0.1' + $munin_cidr_allow = '192.168.0.1/32' + + You can also put an array there. + + On pre-lenny systems, you have to use the older Regexp-variant: + + $munin_allow = '^192\.168\.0\.1$' e. In the node definition in your site.pp for your main munin host, add the following: -- cgit v1.2.3 From 3eccdd86f22ba7c4a6505da7704a4b77830edf93 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 22:42:37 -0500 Subject: update README to note the proper variable for script_path_in --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README') diff --git a/README b/README index 10e6136..e3f5136 100644 --- a/README +++ b/README @@ -71,7 +71,7 @@ To use this module, follow these directions: # Use a non-standard plugin path to use custom plugins munin::plugin { "spamassassin": ensure => "spamassassin", - script_path => "/usr/local/share/munin-plugins", + script_path_in => "/usr/local/share/munin-plugins", } # Use a special config to pass parameters to the plugin -- cgit v1.2.3 From a8d3b6af4a63724ca31eab772978a35927797b2b Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Wed, 30 Dec 2009 15:11:39 -0800 Subject: add support for setting munin and munin-node package versions --- README | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'README') diff --git a/README b/README index e3f5136..5018472 100644 --- a/README +++ b/README @@ -56,12 +56,24 @@ To use this module, follow these directions: e. In the node definition in your site.pp for your main munin host, add the following: include munin::host + + If you want to specify a particular package version for the main munin + host, you can set the $munin_ensure_version variable _before_ the above + include, like this + + $munin_ensure_version = "1.2.6-17" f. On each node that will gather munin statistics, add this line to that node's entry in site.pp (you may want to also add this to your main munin host): include munin::client + If you want to specify a particular package version for the munin + client, you can set the $munin_ensure_version variable _before_ the + above include, like this + + $munin-node_ensure_version = "1.2.6-17" + g. If there are particular munin plugins you want to enable or configure, you define them in the node definition, like follows: -- cgit v1.2.3 From da6ded035a7074306587c76e8d3b90cda6b3bdc8 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Wed, 30 Dec 2009 15:34:40 -0800 Subject: can't use - in a variable name --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README') diff --git a/README b/README index 5018472..f787d35 100644 --- a/README +++ b/README @@ -69,10 +69,10 @@ To use this module, follow these directions: include munin::client If you want to specify a particular package version for the munin - client, you can set the $munin_ensure_version variable _before_ the + client, you can set the $munin_node_ensure_version variable _before_ the above include, like this - $munin-node_ensure_version = "1.2.6-17" + $munin_node_ensure_version = "1.2.6-17" g. If there are particular munin plugins you want to enable or configure, you define them in the node definition, like follows: -- cgit v1.2.3