cf7d0df83b
Merge remote-tracking branch 'upstream/master'
2022-06-22 11:02:51 -04:00
Gregory Ballantine
b517dd7115
Fixed merging again in map.jinja
2018-04-01 00:19:01 -04:00
Gregory Ballantine
c81dec7460
Changed name of default_settings variable to defaults
2018-04-01 00:05:29 -04:00
Gregory Ballantine
bc3e34f409
Fixed merging again
2018-04-01 00:03:22 -04:00
Gregory Ballantine
cfbdfbaae8
Fixed merging of values from pillar, defaults and OS maps
2018-04-01 00:00:59 -04:00
Gregory Ballantine
5d7c995a03
Fixed merging dicts in map.jinja
2018-03-31 23:47:40 -04:00
Gregory Ballantine
7049998115
Updated map.jinja
2018-03-31 23:45:03 -04:00
Gregory Ballantine
153273cd56
Cleaned up map.jinja some more
2018-03-31 23:32:11 -04:00
Gregory Ballantine
6ea7f4867a
Fixed some variable names in map.jinja
2018-03-31 23:24:47 -04:00
Gregory Ballantine
8eae7150b7
Fixed merging default values into missing pillar values
2018-03-31 23:16:01 -04:00
Gregory Ballantine
3860426651
Fixed the user and group owners for some munin master files
2018-03-31 21:08:42 -04:00
Raphaël Hertzog
0fe2f7e66b
Ensure consistent sorting of configuration directives
2018-02-16 11:08:08 +01:00
Gregory Ballantine
b2f661cdb8
Added a defaults.yaml file to clean up the map.jinja file a little bit
2018-02-01 16:32:44 -05:00
Gregory Ballantine
e3b499516e
Updated the Munin node config - I fixed the munin node plugin directory source and destination directories for the symlinks
2017-11-02 10:40:58 -04:00
Gregory Ballantine
735b19698e
Made the formula actually work
2017-11-02 09:14:49 -04:00
Gregory Ballantine
0e018836f3
Updated the Munin node config for FreeBSD
2017-11-02 08:46:21 -04:00
Niels Abspoel
4c7d1d4f4e
Merge pull request #20 from bmwiedemann/master
...
support SUSE-based OSes
2017-03-14 13:32:17 +01:00
Bernhard M. Wiedemann
416272fb1c
support SUSE-based OSes
...
such as openSUSE and SLES
2017-03-09 15:08:59 +01:00
Forrest
caf6a26307
Merge pull request #19 from dexbleeker/master
...
Fix typo in pillar.example
2016-10-13 16:37:47 -07:00
Dex Bleeker
017bba9ede
Fix typo in pillar.example
2016-10-14 01:04:51 +02:00
Forrest
6a91cf5dcc
Merge pull request #18 from dexbleeker/master
...
Allow user defined variables in munin.conf
2016-10-13 15:49:37 -07:00
Dex Bleeker
4fdb59c2fb
Allow user defined variables in munin.conf
2016-10-14 00:33:24 +02:00
puneet kandhari
d6e4c324b0
Merge pull request #16 from sys4/master
...
Add initial support for Gentoo
2015-12-02 16:42:10 -06:00
Marc Schiffbauer
4f032f9c0b
map.jinja: add remaining Gentoo bits
2015-12-02 23:37:05 +01:00
Marc Schiffbauer
3c583870a0
map.jinja: Add Gentoo support
2015-12-02 23:31:37 +01:00
puneet kandhari
8a819737a6
Merge pull request #15 from sys4/master
...
munin/map.jinja: move lookup data to munin:. namespace
2015-12-02 16:25:24 -06:00
Marc Schiffbauer
f08a195b3e
pillar.example: Add some example lookup data
2015-12-02 23:23:07 +01:00
Marc Schiffbauer
bd5a2669a5
munin/map.jinja: move lookup data to munin:. namespace
...
lookupup data has been in same namespace as the config data
which caused lokkup data ended up in the munin config files
To not clutter templates with ugly "if not lookup" statements
lookup data has been moved to a global "munin:" pillar namespace
2015-12-02 23:06:44 +01:00
puneet kandhari
e9da468f8d
Merge pull request #14 from babilen/fix-13
...
Define munin_node_specific_plugins default value
2015-12-02 13:41:55 -06:00
Wolodja Wentland
0af83482b6
Define munin_node_specific_plugins default value
...
This allows the user to leave munin_node_specific_plugins undefined in
their pillar as the state no longer throws an error in that case. This
fixes #13
2015-12-02 14:05:38 +01:00
Forrest
dbf95139e3
Merge pull request #10 from jamesp9/archlinux
...
archlinux: enable munin-cron as systemd timer
2015-11-28 22:29:51 -08:00
jamesp9
e346e353f4
archlinux: munin-cron
2015-11-29 15:50:33 +11:00
Forrest
cc20e70200
Merge pull request #11 from jamesp9/plugins
...
Enable host specific plugins
2015-11-20 11:43:57 -08:00
jamesp9
a3085eb69e
update pillar example
2015-11-20 22:38:49 +11:00
puneet kandhari
9130acbf90
Merge pull request #9 from abednarik/fix_deprecated_iteritems_method
...
Replace deprecated iteritems() with items()
2015-11-17 07:28:48 -06:00
abednarik
dae63c6948
Replace deprecated iteritems() with items()
2015-11-17 10:15:21 -03:00
jamesp9
77c919f286
plugins: host specific
2015-11-14 12:11:19 +11:00
puneet kandhari
6934665b5a
Merge pull request #7 from Reonaydo/master
...
Makedirs on tls file creation
2015-10-08 06:31:51 -05:00
Leonid Popov
bf4b423531
makedirs on tls file creation
2015-10-08 15:29:10 +08:00
Forrest
6612930c6a
Merge pull request #6 from jamesp9/plugins
...
enable common plugins on a node
2015-10-01 21:50:39 -07:00
jamesp9
6649db745a
enable common plugins on node
2015-10-02 14:38:55 +10:00
Forrest
3aef93425b
Merge pull request #4 from roock/master
...
adding inital support for arch linux
2015-09-10 12:40:14 -07:00
Roman Pertl
f3108615df
adding inital support for arch linux
2015-09-10 19:29:46 +00:00
Wolodja Wentland
8060a9c946
Merge pull request #2 from ronnix/patch-1
...
Fix typo in README.rst
2014-11-28 17:24:23 +00:00
Ronan Amicel
440ddc151d
Fix typo in README.rst
2014-11-28 16:30:32 +01:00
Nitin Madhok
661c791acb
Update README.rst
...
Fix broken link
2014-07-28 19:59:51 -04:00
Kenny Do
e44d9e11e7
Updated README to conform to standard
2014-01-07 02:20:36 -08:00
Kenny Do
7e671303cb
Added TLS instructions to README
2014-01-06 17:56:55 -08:00
Kenny Do
0ad2f25d31
create private, certificate, and CA certificate files in munin.tls
2014-01-06 17:38:14 -08:00
Kenny Do
38d4b9e069
added munin.tls state to install Perl Net::SSLEay package
2014-01-05 22:34:51 -08:00
