Update default config and documentation for the "library" keyword

This commit is contained in:
Gunnar Beutner 2018-01-22 08:18:05 +01:00
parent 5d464a9f7e
commit 6506a89db3
16 changed files with 8 additions and 70 deletions

View File

@ -247,8 +247,6 @@ This configuration object is available as [checker feature](11-cli-commands.md#c
Example: Example:
``` ```
library "checker"
object CheckerComponent "checker" { object CheckerComponent "checker" {
concurrent_checks = 512 concurrent_checks = 512
} }
@ -268,8 +266,6 @@ to help existing Icinga 1.x users and might be useful for migration scenarios.
Example: Example:
``` ```
library "compat"
object CheckResultReader "reader" { object CheckResultReader "reader" {
spool_dir = "/data/check-results" spool_dir = "/data/check-results"
} }
@ -318,8 +314,6 @@ This configuration object is available as [compatlog feature](14-features.md#com
Example: Example:
``` ```
library "compat"
object CompatLogger "compatlog" { object CompatLogger "compatlog" {
log_dir = "/var/log/icinga2/compat" log_dir = "/var/log/icinga2/compat"
rotation_method = "DAILY" rotation_method = "DAILY"
@ -486,8 +480,6 @@ This configuration object is available as [elasticsearch feature](14-features.md
Example: Example:
``` ```
library "perfdata"
object ElasticsearchWriter "elasticsearch" { object ElasticsearchWriter "elasticsearch" {
host = "127.0.0.1" host = "127.0.0.1"
port = 9200 port = 9200
@ -603,8 +595,6 @@ This configuration object is available as [command feature](14-features.md#exter
Example: Example:
``` ```
library "compat"
object ExternalCommandListener "command" { object ExternalCommandListener "command" {
command_path = "/var/run/icinga2/cmd/icinga2.cmd" command_path = "/var/run/icinga2/cmd/icinga2.cmd"
} }
@ -648,8 +638,6 @@ This configuration object is available as [gelf feature](14-features.md#gelfwrit
Example: Example:
``` ```
library "perfdata"
object GelfWriter "gelf" { object GelfWriter "gelf" {
host = "127.0.0.1" host = "127.0.0.1"
port = 12201 port = 12201
@ -675,8 +663,6 @@ This configuration object is available as [graphite feature](14-features.md#grap
Example: Example:
``` ```
library "perfdata"
object GraphiteWriter "graphite" { object GraphiteWriter "graphite" {
host = "127.0.0.1" host = "127.0.0.1"
port = 2003 port = 2003
@ -845,8 +831,6 @@ This configuration object is available as [ido-mysql feature](14-features.md#db-
Example: Example:
``` ```
library "db_ido_mysql"
object IdoMysqlConnection "mysql-ido" { object IdoMysqlConnection "mysql-ido" {
host = "127.0.0.1" host = "127.0.0.1"
port = 3306 port = 3306
@ -938,8 +922,6 @@ This configuration object is available as [ido-pgsql feature](14-features.md#db-
Example: Example:
``` ```
library "db_ido_pgsql"
object IdoPgsqlConnection "pgsql-ido" { object IdoPgsqlConnection "pgsql-ido" {
host = "127.0.0.1" host = "127.0.0.1"
port = 5432 port = 5432
@ -1024,8 +1006,6 @@ This configuration object is available as [influxdb feature](14-features.md#infl
Example: Example:
``` ```
library "perfdata"
object InfluxdbWriter "influxdb" { object InfluxdbWriter "influxdb" {
host = "127.0.0.1" host = "127.0.0.1"
port = 8086 port = 8086
@ -1086,8 +1066,6 @@ This configuration object is available as [livestatus feature](14-features.md#se
Examples: Examples:
``` ```
library "livestatus"
object LivestatusListener "livestatus-tcp" { object LivestatusListener "livestatus-tcp" {
socket_type = "tcp" socket_type = "tcp"
bind_host = "127.0.0.1" bind_host = "127.0.0.1"
@ -1300,8 +1278,6 @@ This configuration object is available as [notification feature](11-cli-commands
Example: Example:
``` ```
library "notification"
object NotificationComponent "notification" { } object NotificationComponent "notification" { }
``` ```
@ -1319,8 +1295,6 @@ This configuration object is available as [opentsdb feature](14-features.md#open
Example: Example:
``` ```
library "perfdata"
object OpenTsdbWriter "opentsdb" { object OpenTsdbWriter "opentsdb" {
host = "127.0.0.1" host = "127.0.0.1"
port = 4242 port = 4242
@ -1344,8 +1318,6 @@ This configuration object is available as [perfdata feature](14-features.md#writ
Example: Example:
``` ```
library "perfdata"
object PerfdataWriter "perfdata" { object PerfdataWriter "perfdata" {
host_perfdata_path = "/var/spool/icinga2/perfdata/host-perfdata" host_perfdata_path = "/var/spool/icinga2/perfdata/host-perfdata"
@ -1556,8 +1528,6 @@ This configuration object is available as [statusdata feature](14-features.md#st
Example: Example:
``` ```
library "compat"
object StatusDataWriter "status" { object StatusDataWriter "status" {
status_path = "/var/cache/icinga2/status.dat" status_path = "/var/cache/icinga2/status.dat"
objects_path = "/var/cache/icinga2/objects.cache" objects_path = "/var/cache/icinga2/objects.cache"

View File

@ -610,13 +610,9 @@ When no pattern is specified the default pattern "*.conf" is used.
## Library directive <a id="library"></a> ## Library directive <a id="library"></a>
The `library` directive can be used to manually load additional The `library` directive was used to manually load additional
libraries. Libraries can be used to provide additional object types and libraries. Starting with version 2.9 it is no longer necessary to explicitly load
functions. libraries and this directive has no effect.
Example:
library "snmphelper"
## Functions <a id="functions"></a> ## Functions <a id="functions"></a>

View File

@ -2,6 +2,4 @@
* The checker component takes care of executing service checks. * The checker component takes care of executing service checks.
*/ */
library "checker"
object CheckerComponent "checker" { } object CheckerComponent "checker" { }

View File

@ -3,7 +3,5 @@
* commands pipe. * commands pipe.
*/ */
library "compat"
object ExternalCommandListener "command" { } object ExternalCommandListener "command" { }

View File

@ -3,7 +3,5 @@
* that is compatible with Icinga 1.x. * that is compatible with Icinga 1.x.
*/ */
library "compat"
object CompatLogger "compatlog" { } object CompatLogger "compatlog" { }

View File

@ -1,5 +1,3 @@
library "perfdata"
object ElasticsearchWriter "elasticsearch" { object ElasticsearchWriter "elasticsearch" {
//host = "127.0.0.1" //host = "127.0.0.1"
//port = 9200 //port = 9200

View File

@ -4,8 +4,6 @@
* Logstash or any other receiver. * Logstash or any other receiver.
*/ */
library "perfdata"
object GelfWriter "gelf" { object GelfWriter "gelf" {
//host = "127.0.0.1" //host = "127.0.0.1"
//port = 12201 //port = 12201

View File

@ -3,8 +3,6 @@
* performance data to a graphite tcp socket. * performance data to a graphite tcp socket.
*/ */
library "perfdata"
object GraphiteWriter "graphite" { object GraphiteWriter "graphite" {
//host = "127.0.0.1" //host = "127.0.0.1"
//port = 2003 //port = 2003

View File

@ -1,10 +1,8 @@
/** /**
* The db_ido_mysql library implements IDO functionality * The IdoMysqlConnection type implements MySQL support
* for MySQL. * for DB IDO.
*/ */
library "db_ido_mysql"
object IdoMysqlConnection "ido-mysql" { object IdoMysqlConnection "ido-mysql" {
//user = "icinga" //user = "icinga"
//password = "icinga" //password = "icinga"

View File

@ -1,10 +1,8 @@
/** /**
* The db_ido_pgsql library implements IDO functionality * The IdoPgsqlConnection type implements PostgreSQL support
* for PostgreSQL. * for DB IDO.
*/ */
library "db_ido_pgsql"
object IdoPgsqlConnection "ido-pgsql" { object IdoPgsqlConnection "ido-pgsql" {
//user = "icinga" //user = "icinga"
//password = "icinga" //password = "icinga"

View File

@ -3,8 +3,6 @@
* performance data to an InfluxDB HTTP API * performance data to an InfluxDB HTTP API
*/ */
library "perfdata"
object InfluxdbWriter "influxdb" { object InfluxdbWriter "influxdb" {
//host = "127.0.0.1" //host = "127.0.0.1"
//port = 8086 //port = 8086

View File

@ -1,8 +1,6 @@
/** /**
* The livestatus library implements the livestatus query protocol. * The LivestatusListener type implements the Livestatus query protocol.
*/ */
library "livestatus"
object LivestatusListener "livestatus" { } object LivestatusListener "livestatus" { }

View File

@ -2,6 +2,4 @@
* The notification component takes care of executing service checks. * The notification component takes care of executing service checks.
*/ */
library "notification"
object NotificationComponent "notification" { } object NotificationComponent "notification" { }

View File

@ -3,8 +3,6 @@
* performance data to a OpenTSDB tcp socket. * performance data to a OpenTSDB tcp socket.
*/ */
library "perfdata"
object OpenTsdbWriter "opentsdb" { object OpenTsdbWriter "opentsdb" {
//host = "127.0.0.1" //host = "127.0.0.1"
//port = 4242 //port = 4242

View File

@ -3,6 +3,4 @@
* them in a regular interval. * them in a regular interval.
*/ */
library "perfdata"
object PerfdataWriter "perfdata" { } object PerfdataWriter "perfdata" { }

View File

@ -4,7 +4,5 @@
* hosts and services. * hosts and services.
*/ */
library "compat"
object StatusDataWriter "status" { } object StatusDataWriter "status" { }