tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Monitoring backend: Add resources.ini and backends.ini to configure 

refs #4575
This commit is contained in:
Marius Hein 2013-08-19 18:28:14 +02:00
parent 3a8a3b8f2c
commit 7c1ff75199
4 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/modules/monitoring/backends.ini.in
View File

@ -1,10 +1,6 @@
[localdb]
type = ido
host = @ido_host@
port = @ido_port@
user = @ido_user@
pass = @ido_password@
db = @ido_database@
resource = "ido"
@ido_enabled@
[locallive]

39
config/resources.ini.in Normal file
View File

@ -0,0 +1,39 @@
; resources.ini
;
; The configuration file *resources.ini* contains data sources that
; can be referenced in other configurations. This allows you to manage
; all connections to SQL databases in one single place, avoiding the need
: to edit several different configuration files, when the connection
; information of a resource change.
;
; Each section represents a resource, with the section name being the
; identifier used to reference this certain section. Depending on the
; resource type, each section contains different properties. The property
; *type* defines the resource type and thus how the properties are going to
; be interpreted. Currently only the resource type *db* is available.
[icingaweb-pgsql]
type = db
db = pgsql ; PostgreSQL
host = localhost
password = icinga
username = icingaweb
dbname = icingaweb
[icingaweb-mysql]
type = db
db = mysql ; MySQL
host = localhost
password = icinga
username = icingaweb
dbname = icingaweb
[ido]
type = db
db = @ido_db_type@
host = @ido_host@
password = @ido_user@
username = @ido_user@
port = @ido_port@
dbname = @ido_database@

56
configure vendored
View File

@ -1,6 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Icinga2Web 0.0.1.
# Generated by GNU Autoconf 2.69 for Icinga2Web 1.0.0.
#
# Report bugs to <info@icinga.org>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -264,10 +266,11 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
$as_echo "$0: Please tell bug-autoconf@gnu.org and info@icinga.org
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
$0: have one."
fi
exit 1
fi
@ -577,9 +580,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Icinga2Web'
PACKAGE_TARNAME='icinga2web'
PACKAGE_VERSION='0.0.1'
PACKAGE_STRING='Icinga2Web 0.0.1'
PACKAGE_BUGREPORT=''
PACKAGE_VERSION='1.0.0'
PACKAGE_STRING='Icinga2Web 1.0.0'
PACKAGE_BUGREPORT='info@icinga.org'
PACKAGE_URL=''
ac_default_prefix=/usr/local/icinga2-web
@ -1255,7 +1258,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 Icinga2Web 0.0.1 to adapt to many kinds of systems.
\`configure' configures Icinga2Web 1.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1316,7 +1319,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Icinga2Web 0.0.1:";;
short | recursive ) echo "Configuration of Icinga2Web 1.0.0:";;
esac
cat <<\_ACEOF
@ -1421,7 +1424,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to the package provider.
Report bugs to <info@icinga.org>.
_ACEOF
ac_status=$?
fi
@ -1484,7 +1487,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Icinga2Web configure 0.0.1
Icinga2Web configure 1.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1501,7 +1504,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 Icinga2Web $as_me 0.0.1, which was
It was created by Icinga2Web $as_me 1.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2191,7 +2194,6 @@ fi
# Checks for libraries.
for x in sockets json;do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module" >&5
$as_echo_n "checking if php has $x module... " >&6; }
@ -2204,9 +2206,9 @@ fi
done
# Checks for header files.
#
# Configuration files
#
# Check whether --with-icinga2web_config_path was given.
if test "${with_icinga2web_config_path+set}" = set; then :
@ -2218,7 +2220,7 @@ fi
#
# Users for webfiles
# Users for webfiles
#
@ -2540,7 +2542,7 @@ fi
if test "${with_ido_db_type+set}" = set; then :
withval=$with_ido_db_type; ido_db_type=$withval
else
ido_db_type="statusdat"
ido_db_type="mysql"
fi
@ -2950,7 +2952,6 @@ fi
# command pipe
# Comment placeholders for toggling backends
@ -2962,9 +2963,15 @@ fi
ac_config_files="$ac_config_files Makefile config/authentication.ini config/modules/monitoring/backends.ini public/index.php"
#
# Create config files
#
ac_config_files="$ac_config_files Makefile config/authentication.ini config/resources.ini config/modules/monitoring/backends.ini public/index.php"
#
# Commit and write
#
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@ -3507,7 +3514,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 Icinga2Web $as_me 0.0.1, which was
This file was extended by Icinga2Web $as_me 1.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -3554,13 +3561,13 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
Report bugs to the package provider."
Report bugs to <info@icinga.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Icinga2Web config.status 0.0.1
Icinga2Web config.status 1.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -3673,6 +3680,7 @@ do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"config/authentication.ini") CONFIG_FILES="$CONFIG_FILES config/authentication.ini" ;;
"config/resources.ini") CONFIG_FILES="$CONFIG_FILES config/resources.ini" ;;
"config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;;
"public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;;

3
configure.ac
View File

@ -216,7 +216,7 @@ AC_ARG_WITH([icinga_backend],
AC_ARG_WITH([ido_db_type],
AS_HELP_STRING([--with-ido-db-type=(mysql, pgsql)], [database engine to use for retrieving data from the ido db (default: mysql)]),
ido_db_type=$withval,
ido_db_type="statusdat"
ido_db_type="mysql"
)
AC_ARG_WITH([ido_host],
@ -480,6 +480,7 @@ AC_SUBST(INSTALL_OPTS_WEB)
AC_CONFIG_FILES([
Makefile
config/authentication.ini
config/resources.ini
config/modules/monitoring/backends.ini
public/index.php
])