From 6978dcf0c91170cdd87296ae12e0a97eadeaeeb8 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 29 Sep 2017 11:45:44 +0200 Subject: [PATCH] Update doc refs #54 --- README.md | 21 ++++--------------- sample-config/icinga2/config.ini | 2 -- .../icinga2/templates/icinga2/disk.conf | 10 --------- .../icinga2/templates/icinga2/hostalive.conf | 11 ---------- .../icinga2/templates/icinga2/http-size.conf | 9 -------- .../icinga2/templates/icinga2/http-time.conf | 7 ------- .../icinga2/templates/icinga2/icinga.conf | 10 --------- .../icinga2/templates/icinga2/load.conf | 10 --------- .../icinga2/templates/icinga2/ping4.conf | 10 --------- .../icinga2/templates/icinga2/procs.conf | 8 ------- .../icinga2/templates/icinga2/ssh.conf | 8 ------- .../icinga2/templates/icinga2/swap.conf | 7 ------- .../icinga2/templates/icinga2/templateset.ini | 7 ------- .../templates/collectd/apache_scoreboard.conf | 16 -------------- .../others/templates/collectd/cpu.conf | 16 -------------- .../others/templates/collectd/disk.conf | 9 -------- .../others/templates/collectd/disk_ops.conf | 6 ------ .../others/templates/collectd/interface.conf | 7 ------- .../others/templates/collectd/load.conf | 8 ------- .../others/templates/collectd/memory.conf | 10 --------- .../templates/collectd/mysql_commands.conf | 16 -------------- .../templates/collectd/mysql_threads.conf | 8 ------- .../others/templates/collectd/processes.conf | 12 ----------- .../collectd/processes_fork_rate.conf | 6 ------ .../others/templates/collectd/swap.conf | 9 -------- .../others/templates/collectd/swap_io.conf | 6 ------ .../others/templates/collectd/templateset.ini | 5 ----- 27 files changed, 4 insertions(+), 250 deletions(-) delete mode 100644 sample-config/icinga2/config.ini delete mode 100644 sample-config/icinga2/templates/icinga2/disk.conf delete mode 100644 sample-config/icinga2/templates/icinga2/hostalive.conf delete mode 100644 sample-config/icinga2/templates/icinga2/http-size.conf delete mode 100644 sample-config/icinga2/templates/icinga2/http-time.conf delete mode 100644 sample-config/icinga2/templates/icinga2/icinga.conf delete mode 100644 sample-config/icinga2/templates/icinga2/load.conf delete mode 100644 sample-config/icinga2/templates/icinga2/ping4.conf delete mode 100644 sample-config/icinga2/templates/icinga2/procs.conf delete mode 100644 sample-config/icinga2/templates/icinga2/ssh.conf delete mode 100644 sample-config/icinga2/templates/icinga2/swap.conf delete mode 100644 sample-config/icinga2/templates/icinga2/templateset.ini delete mode 100644 sample-config/others/templates/collectd/apache_scoreboard.conf delete mode 100644 sample-config/others/templates/collectd/cpu.conf delete mode 100644 sample-config/others/templates/collectd/disk.conf delete mode 100644 sample-config/others/templates/collectd/disk_ops.conf delete mode 100644 sample-config/others/templates/collectd/interface.conf delete mode 100644 sample-config/others/templates/collectd/load.conf delete mode 100644 sample-config/others/templates/collectd/memory.conf delete mode 100644 sample-config/others/templates/collectd/mysql_commands.conf delete mode 100644 sample-config/others/templates/collectd/mysql_threads.conf delete mode 100644 sample-config/others/templates/collectd/processes.conf delete mode 100644 sample-config/others/templates/collectd/processes_fork_rate.conf delete mode 100644 sample-config/others/templates/collectd/swap.conf delete mode 100644 sample-config/others/templates/collectd/swap_io.conf delete mode 100644 sample-config/others/templates/collectd/templateset.ini diff --git a/README.md b/README.md index 434a71f..e0aa00c 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,7 @@ values or similar. Just extract/clone this module to a `graphite` subfolder in your Icinga Web 2 module path. Enable the graphite module in your Icinga Web 2 frontend -(Configuration -> Modules -> graphite -> enable) and it should work out of -the box. +(*Configuration* > *Modules* > *graphite* > *enable*). NB: It is best practice to install 3rd party modules into a distinct module folder for example `/usr/share/icingaweb2/modules`. In case you don't know where this @@ -53,21 +52,9 @@ might be please check the module path in your Icinga Web 2 configuration. ## Configuration -Copy the sample configuration to `/etc/icingaweb2/modules` like so: - - mkdir -p /etc/icingaweb2/modules/graphite - cp -rv sample-config/icinga2/* /etc/icingaweb2/modules/graphite - -Change permissions: - - chown -R root:icingaweb2 /etc/icingaweb2/modules/graphite - chmod -R 2755 /etc/icingaweb2/modules/graphite - -Edit `/etc/icingaweb2/modules/graphite/config.ini` and set `web\_url` -to the Graphite web host. - - [graphite] - web_url = http://my.graphite.web +Open Icinga Web 2 (web UI) and navigate to *Configuration* > *Modules* > +*graphite* > *Backend*. Fill in the Graphite Web root URL +(e.g. `http://192.0.2.1:8003/`) and the HTTP basic auth credentials (if any). You don't need any configuration in your Icinga 2 installation (e.g. additional custom vars). diff --git a/sample-config/icinga2/config.ini b/sample-config/icinga2/config.ini deleted file mode 100644 index 4ee79fe..0000000 --- a/sample-config/icinga2/config.ini +++ /dev/null @@ -1,2 +0,0 @@ -[graphite] -web_url = http://my.graphite.web diff --git a/sample-config/icinga2/templates/icinga2/disk.conf b/sample-config/icinga2/templates/icinga2/disk.conf deleted file mode 100644 index 44f30b4..0000000 --- a/sample-config/icinga2/templates/icinga2/disk.conf +++ /dev/null @@ -1,10 +0,0 @@ -title = Disk $disk -filter = $icingaService.disk.perfdata.$disk -yUnitSystem = si -min = 0 -areaMode = all - -max : color=#44bb77, alias=Size -value : color=#ffaa44, alias=Used - - diff --git a/sample-config/icinga2/templates/icinga2/hostalive.conf b/sample-config/icinga2/templates/icinga2/hostalive.conf deleted file mode 100644 index a58f467..0000000 --- a/sample-config/icinga2/templates/icinga2/hostalive.conf +++ /dev/null @@ -1,11 +0,0 @@ -title = Host alive -filter = $icingaHost.hostalive.perfdata -min = 0 -yUnitSystem = msec -areaMode = all -areaAlpha = 0.4 - -rta.value : color=#44bb77, alias=Round trip time -pl.value : color=red, alias=Packet loss - - diff --git a/sample-config/icinga2/templates/icinga2/http-size.conf b/sample-config/icinga2/templates/icinga2/http-size.conf deleted file mode 100644 index 483e48e..0000000 --- a/sample-config/icinga2/templates/icinga2/http-size.conf +++ /dev/null @@ -1,9 +0,0 @@ -title = HTTP response size -filter = $icingaService.http.perfdata.size -areaMode = first -areaAlpha = 0.3 -yUnitSystem = binary -min = 0 - -value : color=darkgreen, alias=Response size - diff --git a/sample-config/icinga2/templates/icinga2/http-time.conf b/sample-config/icinga2/templates/icinga2/http-time.conf deleted file mode 100644 index 92ac9c1..0000000 --- a/sample-config/icinga2/templates/icinga2/http-time.conf +++ /dev/null @@ -1,7 +0,0 @@ -title = HTTP response time -filter = $icingaService.http.perfdata.time -areaMode = first -areaAlpha = 0.3 - -value : color=orange, alias=Response time - diff --git a/sample-config/icinga2/templates/icinga2/icinga.conf b/sample-config/icinga2/templates/icinga2/icinga.conf deleted file mode 100644 index a44f92e..0000000 --- a/sample-config/icinga2/templates/icinga2/icinga.conf +++ /dev/null @@ -1,10 +0,0 @@ -title = Icinga services -filter = $icingaService.icinga.perfdata -areaMode = stacked -areaAlpha = 0.6 -lineWidth = 0 - -num_services_ok.value : color=green, alias=Services OK -num_services_warning.value : color=orange, alias=Services Warning -num_services_critical.value : color=red, alias=Services Critical - diff --git a/sample-config/icinga2/templates/icinga2/load.conf b/sample-config/icinga2/templates/icinga2/load.conf deleted file mode 100644 index 936ca58..0000000 --- a/sample-config/icinga2/templates/icinga2/load.conf +++ /dev/null @@ -1,10 +0,0 @@ -title = Load -filter = $icingaService.load.perfdata -areaMode = first -areaAlpha = 0.3 - -#max = 16 -load1.value : color=yellow, alias=Load 1 -load5.value : color=orange, alias=Load 5 -load15.value: color=red, alias=Load 15 - diff --git a/sample-config/icinga2/templates/icinga2/ping4.conf b/sample-config/icinga2/templates/icinga2/ping4.conf deleted file mode 100644 index e3052f2..0000000 --- a/sample-config/icinga2/templates/icinga2/ping4.conf +++ /dev/null @@ -1,10 +0,0 @@ -title = Ping -filter = $icingaService.ping4.perfdata -min = 0 -areaMode = all -areaAlpha = 0.4 - -rta.value : color=#44bb77, alias=Round trip time -pl.value : color=red, alias=Packet loss - - diff --git a/sample-config/icinga2/templates/icinga2/procs.conf b/sample-config/icinga2/templates/icinga2/procs.conf deleted file mode 100644 index f352a9f..0000000 --- a/sample-config/icinga2/templates/icinga2/procs.conf +++ /dev/null @@ -1,8 +0,0 @@ -title = Process count -filter = $icingaService.procs.perfdata.procs -areaMode = first -areaAlpha = 0.3 -min = 0 - -value : color=blue, alias=Process count - diff --git a/sample-config/icinga2/templates/icinga2/ssh.conf b/sample-config/icinga2/templates/icinga2/ssh.conf deleted file mode 100644 index e6a3194..0000000 --- a/sample-config/icinga2/templates/icinga2/ssh.conf +++ /dev/null @@ -1,8 +0,0 @@ -title = SSH response time -filter = $icingaService.ssh.perfdata.time -areaMode = first -areaAlpha = 0.3 -min = 0 - -value : color=red, alias=Response time - diff --git a/sample-config/icinga2/templates/icinga2/swap.conf b/sample-config/icinga2/templates/icinga2/swap.conf deleted file mode 100644 index ca8fa7d..0000000 --- a/sample-config/icinga2/templates/icinga2/swap.conf +++ /dev/null @@ -1,7 +0,0 @@ -title = Swap -filter = $icingaService.swap.perfdata.swap -areaMode = stacked -yUnitSystem = binary - -value : color=red, alias=Used swap space - diff --git a/sample-config/icinga2/templates/icinga2/templateset.ini b/sample-config/icinga2/templates/icinga2/templateset.ini deleted file mode 100644 index 8688ab4..0000000 --- a/sample-config/icinga2/templates/icinga2/templateset.ini +++ /dev/null @@ -1,7 +0,0 @@ -[templateset] -name = "Icinga 2" - -[patterns] -icingaHost = icinga2.$hostname.host -icingaService = icinga2.$hostname.services.$service - diff --git a/sample-config/others/templates/collectd/apache_scoreboard.conf b/sample-config/others/templates/collectd/apache_scoreboard.conf deleted file mode 100644 index 2769849..0000000 --- a/sample-config/others/templates/collectd/apache_scoreboard.conf +++ /dev/null @@ -1,16 +0,0 @@ -title = Apache Scoreboard -filter = $host.apache.$apache_host.apache_scoreboard -areaMode = stacked - -open : color=green, alias=Open slot (no process) -waiting : color=darkgreen, alias=Waiting for Connection -starting : color=gray, alias=Starting up -reading : color=aqua, alias=Reading Request -sending : color=rose, alias=Sending Reply -keepalive : color=blue, alias=KeepAlive (read) -dnslookup : color=red, alias=DNS Lookup -closing : color=darkred, alias=Closing connection -logging : color=orange, alias=Logging -finishing : color=gray, alias=Gracefully finishing -idle_cleanup : color=gray, alias=Idle cleanup of worker - diff --git a/sample-config/others/templates/collectd/cpu.conf b/sample-config/others/templates/collectd/cpu.conf deleted file mode 100644 index efd488e..0000000 --- a/sample-config/others/templates/collectd/cpu.conf +++ /dev/null @@ -1,16 +0,0 @@ -title = CPU $cpu -filter = $host.cpu.$cpu.cpu -max = 100 -areaMode = stacked -lineWidth = 1 - -idle : color=#44bb77, alias=Idle -nice : color=gray, alias=Nice -user : color=yellow, alias=User -system : color=orange, alias=System -wait : color=brown, alias=Wait -reading : color=aqua, alias=Reading -steal : color=blue, alias=Steal -softirq : color=red, alias=Soft IRQ -interrupt : color=purple, alias=Interrupt - diff --git a/sample-config/others/templates/collectd/disk.conf b/sample-config/others/templates/collectd/disk.conf deleted file mode 100644 index 1df3133..0000000 --- a/sample-config/others/templates/collectd/disk.conf +++ /dev/null @@ -1,9 +0,0 @@ -title = Disk $disk -filter = $host.df.$disk.df_complex -areaMode = stacked -yUnitSystem = si - -free : color=#44bb77, alias=Free -reserved : color=yellow, alias=Reserved -used : color=#ffaa44, alias=Used - diff --git a/sample-config/others/templates/collectd/disk_ops.conf b/sample-config/others/templates/collectd/disk_ops.conf deleted file mode 100644 index f9bebfd..0000000 --- a/sample-config/others/templates/collectd/disk_ops.conf +++ /dev/null @@ -1,6 +0,0 @@ -title = Disk operations $disk -filter = $host.disk.$disk.disk_ops - -read : color=green, alias=Read -write : color=blue, alias=Write - diff --git a/sample-config/others/templates/collectd/interface.conf b/sample-config/others/templates/collectd/interface.conf deleted file mode 100644 index c60287d..0000000 --- a/sample-config/others/templates/collectd/interface.conf +++ /dev/null @@ -1,7 +0,0 @@ -title = Interface $interface -filter = $host.interface.$interface.if_octets -yUnitSystem = binary - -rx : color=green, scale=8, alias=bit/s in -tx : color=blue, scale=8, alias=bit/s out - diff --git a/sample-config/others/templates/collectd/load.conf b/sample-config/others/templates/collectd/load.conf deleted file mode 100644 index 95f896d..0000000 --- a/sample-config/others/templates/collectd/load.conf +++ /dev/null @@ -1,8 +0,0 @@ -title = Load -filter = $host.load - -#max = 16 -shortterm: color=yellow, alias=Load 1 -midterm : color=orange, alias=Load 5 -longterm : color=red, alias=Load 15 - diff --git a/sample-config/others/templates/collectd/memory.conf b/sample-config/others/templates/collectd/memory.conf deleted file mode 100644 index 5218a67..0000000 --- a/sample-config/others/templates/collectd/memory.conf +++ /dev/null @@ -1,10 +0,0 @@ -title = Memory -filter = $host.memory -areaMode = stacked -yUnitSystem = binary - -free : color=#44bb77, alias=Free -cached : color=gray, alias=Cached -buffered : color=darkgray, alias=Buffered -used : color=orange, alias=Used - diff --git a/sample-config/others/templates/collectd/mysql_commands.conf b/sample-config/others/templates/collectd/mysql_commands.conf deleted file mode 100644 index 38f6d64..0000000 --- a/sample-config/others/templates/collectd/mysql_commands.conf +++ /dev/null @@ -1,16 +0,0 @@ -title = MySQL Commands -filter = $host.mysql.mysql_commands -areaMode = stacked - -select : color=green, alias=SELECT -insert : color=aqua, alias=INSERT -insert_select : color=blue, alias=INSERT ... SELECT -update : color=yellow, alias=UPDATE -update_multi : color=orange, alias=UPDATE (multi) -delete : color=red, alias=DELETE -drop_* : color=darkred, alias=DROP -begin : color=darkgreen, alias=BEGIN -commit : color=#44bb77, alias=COMMIT -rollback : color=rose, alias=ROLLBACK -show_* : color=gray, alias=SHOW - diff --git a/sample-config/others/templates/collectd/mysql_threads.conf b/sample-config/others/templates/collectd/mysql_threads.conf deleted file mode 100644 index 1e220dd..0000000 --- a/sample-config/others/templates/collectd/mysql_threads.conf +++ /dev/null @@ -1,8 +0,0 @@ -title = MySQL Threads -filter = $host.mysql.threads -areaMode = stacked - -cached : color=#44bb77, alias=Cached -connected : color=yellow, alias=Connected -running : color=orange, alias=Running - diff --git a/sample-config/others/templates/collectd/processes.conf b/sample-config/others/templates/collectd/processes.conf deleted file mode 100644 index f0a4c85..0000000 --- a/sample-config/others/templates/collectd/processes.conf +++ /dev/null @@ -1,12 +0,0 @@ -title = Processes -filter = $host.processes.ps_state -areaMode = stacked -lineWidth = 1 - -sleeping : color=#44bb77, alias=Sleeping -running : color=yellow, alias=Running -stopped : color=blue, alias=Stopped -zombies : color=orange, alias=Zombies -paging : color=red, alias=Paging -blocked : color=purple, alias=Blocked - diff --git a/sample-config/others/templates/collectd/processes_fork_rate.conf b/sample-config/others/templates/collectd/processes_fork_rate.conf deleted file mode 100644 index 127da44..0000000 --- a/sample-config/others/templates/collectd/processes_fork_rate.conf +++ /dev/null @@ -1,6 +0,0 @@ -title = Process Fork Rate -filter = $host.processes -lineWidth = 1 - -fork_rate : color=red, alias=Fork rate - diff --git a/sample-config/others/templates/collectd/swap.conf b/sample-config/others/templates/collectd/swap.conf deleted file mode 100644 index 0c3c5fb..0000000 --- a/sample-config/others/templates/collectd/swap.conf +++ /dev/null @@ -1,9 +0,0 @@ -title = Swap -filter = $host.swap -areaMode = stacked -yUnitSystem = binary - -free : color=#44bb77, alias=Free -cached : color=orange, alias=Cached -used : color=red, alias=Used - diff --git a/sample-config/others/templates/collectd/swap_io.conf b/sample-config/others/templates/collectd/swap_io.conf deleted file mode 100644 index ddade55..0000000 --- a/sample-config/others/templates/collectd/swap_io.conf +++ /dev/null @@ -1,6 +0,0 @@ -title = Swap I/O -filter = $host.swap.swap_io - -in : color=#44bb77, alias=In -out : color=blue, alias=Out - diff --git a/sample-config/others/templates/collectd/templateset.ini b/sample-config/others/templates/collectd/templateset.ini deleted file mode 100644 index 68358b0..0000000 --- a/sample-config/others/templates/collectd/templateset.ini +++ /dev/null @@ -1,5 +0,0 @@ -[templateset] -name = "Collectd (Sample)" - -[patterns] -host = base.$osfamily.$osversion.$customer_type.$customer.$hostgroup.$hostname