Bump

README.md

@@ -65,69 +65,3 @@ make all
 etc....but some of us (me) prefers to have a software package, to organize
 software installation/update/removal. 
 
-@@ -8,3 +8,8 @@
- 
- http://pnp4nagios.sourceforge.net      or:
- http://docs.pnp4nagios.org/
-
-## pnp-metrics-api ###
-
-https://github.com/lingej/pnp-metrics-api
-README.md
-
-# pnp-metrics-api
-## Usage examples
-### CURL
-#### Query metrics of a service on a specific host
-```
-curl -s -u '<username>:<password>' -H "Content-Type: application/json" -X POST -d '
-{
-   "targets":[
-      {
-         "host":"host1.example.org",
-         "service":"_HOST_",
-         "perflabel":"rta",
-         "type":"AVERAGE"
-      },
-      {
-     "host":"host2.example.org",
-         "service":"_HOST_",
-         "perflabel":"rta",
-         "type":"AVERAGE"
-      }
-   ],
-   "start":'UNIXEPOCHTIMESTAMP_START',
-   "end":'UNIXEPOCHTIMESTAMP_END'
-}' https://example.org/pnp4nagios/index.php/api/metrics
-```
-#### List all hosts
-```
-curl -s -u '<username>:<password>' https://example.org/pnp4nagios/index.php/api/hosts
-```
-
-#### List services of a host
-```
-curl -s -u '<username>:<password>' -H "Content-Type: application/json" -X POST -d '
-{
-   "host":"host.example.org"
-}' https://example.org/pnp4nagios/index.php/api/services
-```
-
-You can use regular expressions for host lists:
-
-```
-curl -s -u '<username>:<password>' -H "Content-Type: application/json" -X POST -d '
-{
-   "host":"/^local"
-}' https://example.org/pnp4nagios/index.php/api/services
-```
-
-
-#### List labels of a service of specific host
-```
-curl -s -u '<username>:<password>' -H "Content-Type: application/json" -X POST -d '
-{
-   "host":"host.example.org",
-   "service":"_HOST_"
-}' https://example.org/pnp4nagios/index.php/api/labels
-```

configure.ac

@@ -491,7 +491,7 @@ fi
 
 AC_SUBST(nagios_user)
 AC_SUBST(nagios_grp)
-INSTALL_OPTS=""
+INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
 AC_SUBST(INSTALL_OPTS)
 
 #

sample-config/config_samples/config.php.in

@@ -100,8 +100,7 @@ $conf['temp'] = "/tmp";
 #
 # Link back to Nagios or Thruk ( www.thruk.org )
 #
-## Debian: please see /etc/pnp4nagios/config.<NAME>.php
+$conf['nagios_base'] = "/nagios/cgi-bin";
-##$conf['nagios_base'] = "/cgi-bin/nagios4";
 
 #
 # Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )
@@ -292,9 +291,3 @@ $scheme['mixed2']   = array ('#b2182b','#2166ac','#d6604d','#4393c3','#f4a582','
                              '#F6E8C3','#C7EAE5','#DFC27D','#80CDC1','#BF812D','#35978F','#8C510A','#01665E');
 $scheme['mixed3']   = array ('#67001F','#80CDC1','#B2182B','#35978F','#D6604D','#01665E','#F4A582','#003C30',
                              '#FDDBC7','#92C5DE','#D1E5F0','#2166AC','#4393C3','#8C510A','#053061','#BF812D');
-
-if (file_exists('/etc/pnp4nagios/config.icinga.php')) {
-    include '/etc/pnp4nagios/config.icinga.php';
-} else if (file_exists('/etc/pnp4nagios/config.nagios4.php')) {
-    include '/etc/pnp4nagios/config.nagios4.php';
-}

sample-config/config_samples/npcd.cfg.in

@@ -76,7 +76,7 @@ log_level = 0
 # perfdata_spool_dir = </path/to/directory/>
 #
 
-perfdata_spool_dir = @PERFDATA_SPOOL_DIR@/npcd/
+perfdata_spool_dir = @PERFDATA_SPOOL_DIR@
 
 
 # Execute following command for each found file
@@ -163,7 +163,7 @@ pid_file=@piddir@/npcd.pid
 # perfdata_file = </path/to/file>
 #
 
-perfdata_file = @PERFDATA_SPOOL_DIR@/nagios/perfdata.dump
+perfdata_file = @localstatedir@/perfdata.dump
 
 
 # perfdata_spool_filename - declare the destination