[icinga-checkins] icinga.org: icinga-reports/next: fixed pnp4nagios path #3693

git at icinga.org git at icinga.org
Wed Apr 10 13:41:39 CEST 2013


Module: icinga-reports
Branch: next
Commit: 8e6a29fde56aa52f7bfbc3b32e3c9ae85c4a6eaa
URL:    https://git.icinga.org/?p=icinga-reports.git;a=commit;h=8e6a29fde56aa52f7bfbc3b32e3c9ae85c4a6eaa

Author: Bernd Erk <bernd.erk at icinga.org>
Date:   Wed Apr 10 13:23:45 2013 +0200

fixed pnp4nagios path #3693

refs #3693

---

 CHANGELOG                                          |    3 +++
 configure                                          |   20 ++++++++++----------
 configure.in                                       |    4 ++--
 .../sub/samples/activityWithGraphInGivenTime.jrxml |    2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 83817d0..85bca05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@ Icinga Reporting Change Log
 
 Thanks to all contributers, testers and developers. Please read AUTHORS and THANKS for a detailed list :-)
 
+1.9.0
+- fixed image expression in pnp4nagios template #3693
+
 1.8.0 
 
 - added new template design and corrected some template issues
diff --git a/configure b/configure
index 9aef9a0..051908e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for icinga-reports 1.8.2.
+# Generated by GNU Autoconf 2.68 for icinga-reports 1.9.
 #
 # Report bugs to <icinga-devel at lists.sourceforge.net>.
 #
@@ -559,8 +559,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='icinga-reports'
 PACKAGE_TARNAME='icinga-reports'
-PACKAGE_VERSION='1.8.2'
-PACKAGE_STRING='icinga-reports 1.8.2'
+PACKAGE_VERSION='1.9'
+PACKAGE_STRING='icinga-reports 1.9'
 PACKAGE_BUGREPORT='icinga-devel at lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1194,7 +1194,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icinga-reports 1.8.2 to adapt to many kinds of systems.
+\`configure' configures icinga-reports 1.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1264,7 +1264,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icinga-reports 1.8.2:";;
+     short | recursive ) echo "Configuration of icinga-reports 1.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1342,7 +1342,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icinga-reports configure 1.8.2
+icinga-reports configure 1.9
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1359,7 +1359,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icinga-reports $as_me 1.8.2, which was
+It was created by icinga-reports $as_me 1.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2174,7 +2174,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icinga-reports'
- VERSION='1.8.2'
+ VERSION='1.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2941,7 +2941,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icinga-reports $as_me 1.8.2, which was
+This file was extended by icinga-reports $as_me 1.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2994,7 +2994,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-icinga-reports config.status 1.8.2
+icinga-reports config.status 1.9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 8bd64e9..cc7246b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 PKG_NAME=icinga-reports
-PKG_VERSION="1.8.2"
+PKG_VERSION="1.9"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="10-17-2012"
 
 AC_PREREQ([2.67])
-AC_INIT(icinga-reports,1.8.2,icinga-devel at lists.sourceforge.net)
+AC_INIT(icinga-reports,1.9,icinga-devel at lists.sourceforge.net)
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
 
diff --git a/reports/icinga/templates/sub/samples/activityWithGraphInGivenTime.jrxml b/reports/icinga/templates/sub/samples/activityWithGraphInGivenTime.jrxml
index 8062d26..fef9165 100644
--- a/reports/icinga/templates/sub/samples/activityWithGraphInGivenTime.jrxml
+++ b/reports/icinga/templates/sub/samples/activityWithGraphInGivenTime.jrxml
@@ -179,7 +179,7 @@ and object_id                  = $P{p_service_object_id}]]>
 			</textField>
 			<image>
 				<reportElement x="5" y="100" width="550" height="225"/>
-				<imageExpression><![CDATA["pnp-server" + "/pnp4nagios/graph?" + "host=" + $F{name1} + "&srv=" + $F{display_name} + "&start=" + $P{p_date_start}+ "&end=" + $P{p_date_end}]]></imageExpression>
+				<imageExpression><![CDATA["pnp-server-url-with-path + "?" + "host=" + $F{name1} + "&srv=" + $F{display_name} + "&start=" + $P{p_date_start}+ "&end=" + $P{p_date_end}]]></imageExpression>
 			</image>
 		</band>
 		<band height="50">





More information about the icinga-checkins mailing list