mirror of
https://github.com/munin-monitoring/muninlite.git
synced 2024-12-22 05:42:13 +01:00
Change name of executable from "munin-node" to "muninlite"
Previously MuninLite tried to create a drop-in-replacement for munin-node by using the same name. But MuninLite behaves differently and may even be used in parallel to a regular munin-node setup on a host, thus it should use a distinct name.
This commit is contained in:
parent
c547314f3d
commit
f4518e5375
11 changed files with 19 additions and 19 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,2 +1,2 @@
|
|||
munin-node
|
||||
muninlite
|
||||
releases/
|
||||
|
|
8
Makefile
8
Makefile
|
@ -1,7 +1,7 @@
|
|||
PLUGINS ?= df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate plugindir_
|
||||
CONFIGURATION_FILE ?= munin-node.conf
|
||||
INPUT_FILE ?= munin-node.in
|
||||
TARGET_FILE ?= munin-node
|
||||
CONFIGURATION_FILE ?= muninlite.conf
|
||||
INPUT_FILE ?= muninlite.in
|
||||
TARGET_FILE ?= muninlite
|
||||
PLUGIN_DIRECTORY ?= plugins
|
||||
PLUGIN_FILES = $(patsubst %,$(PLUGIN_DIRECTORY)/%,$(PLUGINS))
|
||||
VERSION ?= $(shell cat VERSION)
|
||||
|
@ -11,7 +11,7 @@ TGZ_FILE ?= $(DIST_DIR)/muninlite-$(VERSION).tar.gz
|
|||
|
||||
|
||||
$(TARGET_FILE): $(INPUT_FILE) $(PLUGIN_FILES) $(CONFIGURATION_FILE)
|
||||
@echo "Making munin-node for muninlite version $$VERSION"
|
||||
@echo "Making muninlite version $$VERSION"
|
||||
@for plugin_filename in $(PLUGIN_FILES); do \
|
||||
echo "Adding plugin $$(basename "$$plugin_filename")"; done
|
||||
@export VERSION="$(VERSION)"; \
|
||||
|
|
16
README.md
16
README.md
|
@ -45,7 +45,7 @@ Installation
|
|||
------------
|
||||
Download source and unpack it.
|
||||
|
||||
Assemble the munin-node shell script by running `make`:
|
||||
Assemble the MuninLite shell script by running `make`:
|
||||
```shell
|
||||
$ make
|
||||
```
|
||||
|
@ -55,7 +55,7 @@ You may assemble a reduced script by including only specific plugins:
|
|||
$ make PLUGINS="cpu load uptime"
|
||||
```
|
||||
|
||||
Run `make install` or simply copy `munin-node` to a suitable location.
|
||||
Run `make install` or simply copy `muninlite` to a suitable location.
|
||||
|
||||
```shell
|
||||
make install
|
||||
|
@ -76,7 +76,7 @@ Configure the `address` setting of the node in the master's configuration with
|
|||
a suitable transport, e.g.:
|
||||
```
|
||||
[some.host.tld]
|
||||
address ssh://node-a.example.org/usr/local/bin/munin-node
|
||||
address ssh://node-a.example.org/usr/local/bin/muninlite
|
||||
```
|
||||
|
||||
The above example causes the master to connect to the node via ssh and to
|
||||
|
@ -119,9 +119,9 @@ iptables -A INPUT -p tcp --dport munin --source 10.42.42.25 -j ACCEPT
|
|||
|
||||
Test
|
||||
----
|
||||
To test the script, just run it (`/usr/bin/local/munin-node`):
|
||||
To test the script, just run it (`/usr/bin/local/muninlite`):
|
||||
```shell
|
||||
$ /usr/local/bin/munin-node
|
||||
$ /usr/local/bin/muninlite
|
||||
# munin node at localhost.localdomain
|
||||
help
|
||||
# Unknown command. Try list, nodes, config, fetch, version or quit
|
||||
|
@ -153,14 +153,14 @@ Connection closed by foreign host.
|
|||
Plugin configuration
|
||||
--------------------
|
||||
To configure which plugins should be enabled, locate the `PLUGINS`
|
||||
variable in munin-node and remove unwanted plugins.
|
||||
variable in `muninlite` and remove unwanted plugins.
|
||||
|
||||
There is no specific configuration for plugins.
|
||||
|
||||
Munin configuration
|
||||
-------------------
|
||||
Configure your /etc/munin/munin.conf as you would for a regular
|
||||
`munin-node`, if you configured MuninLite as a TCP service (e.g. via
|
||||
`muninnode`, if you configured MuninLite as a TCP service (e.g. via
|
||||
inetd/xinetd):
|
||||
|
||||
```
|
||||
|
@ -173,6 +173,6 @@ In case of direct execution of MuninLite on the remote host (without a TCP
|
|||
service), you need to configure a transport and execute the script directly:
|
||||
```
|
||||
[some.host.tld]
|
||||
address ssh://10.42.42.25/usr/local/bin/munin-node
|
||||
address ssh://10.42.42.25/usr/local/bin/muninlite
|
||||
use_node_name yes
|
||||
```
|
||||
|
|
|
@ -1 +1 @@
|
|||
munin-node : 10.42.42.25
|
||||
muninlite : 10.42.42.25
|
||||
|
|
|
@ -1 +1 @@
|
|||
munin-node : ALL
|
||||
muninlite : ALL
|
||||
|
|
|
@ -1 +1 @@
|
|||
munin stream tcp nowait root /usr/local/bin/munin-node
|
||||
munin stream tcp nowait root /usr/local/bin/muninlite
|
||||
|
|
|
@ -1 +1 @@
|
|||
munin stream tcp nowait root /usr/sbin/tcpd /usr/local/bin/munin-node
|
||||
munin stream tcp nowait root /usr/sbin/tcpd /usr/local/bin/muninlite
|
||||
|
|
|
@ -26,7 +26,7 @@ if [ -f /sbin/inetd ]; then
|
|||
echo "muninlite can not start as lrrd is already in use"
|
||||
exit 1
|
||||
else
|
||||
echo "lrrd stream tcp nowait root /usr/bin/munin-node" >> /etc/inetd.conf
|
||||
echo "lrrd stream tcp nowait root /usr/bin/muninlite" >> /etc/inetd.conf
|
||||
fi
|
||||
PID=$(ps | grep -v grep | grep inetd | sed 's/^ \{1,\}//' | cut -d\ -f1)
|
||||
if [ ! -z "$PID" ]; then
|
||||
|
|
|
@ -6,6 +6,6 @@ service munin
|
|||
user = root
|
||||
group = root
|
||||
only_from = 10.42.42.25
|
||||
server = /usr/local/bin/munin-node
|
||||
server = /usr/local/bin/muninlite
|
||||
disable = no
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue