Skip to content

Commit 034ed58

Browse files
committed
Merge branch 'main' into feature/icingaweb-module-graphite
2 parents 3cd623f + 0e74fff commit 034ed58

File tree

13 files changed

+101
-7
lines changed

13 files changed

+101
-7
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bugfixes:
2+
- Role Icingaweb2: Adjust preferences setting to store preferences in database
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
major_changes:
3+
- Added Installation of Business Process Modeling Module
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
trivial:
3+
- Allow IPv6 address to not exist
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
## Module Icinga Business Process Modeling
2+
3+
The module Icinga Business Process Modeling provides a visualization for hierarchical business processes based on objects monitored by Icinga.
4+
5+
## Configuration
6+
7+
The general module parameter like `enabled` and `source` can be applied here.
8+
9+
For every config file, create a dictionary with sections as keys and the parameters as values. For all parameters please check the [module documentation](https://icinga.com/docs/icinga-business-process-modeling/latest/doc/01-About/)
10+
11+
12+
13+
Example:
14+
```
15+
icingaweb2_modules:
16+
businessprocess:
17+
enabled: true
18+
source: package
19+
```
20+
21+
### Custom Process Files:
22+
23+
Custom process files are a great way to transfer existing business process configurations into the Business Process Modeling Module.
24+
25+
To copy existing processes into the processes folder please use the `custom_process_files` dictionary.
26+
27+
The `src_path` will search within any `files/` directory in the Ansible environment.
28+
```
29+
icingaweb2_modules:
30+
businessprocess:
31+
enabled: true
32+
source: package
33+
custom_process_files:
34+
- name: test.conf
35+
src_path: processes/test.conf
36+
```

molecule/default/converge.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@
119119
- zones.d/main/commands
120120
- zones.d/main/hosts
121121
- zones.d/main/services
122+
icingaweb2_modules:
123+
businessprocess:
124+
enabled: true
125+
source: package
126+
custom_process_files:
127+
- name: test.conf
128+
src_path: test.conf
122129
collections:
123130
- icinga.icinga
124131
pre_tasks:

molecule/default/files/test.conf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Business Process Config File ###
2+
#
3+
# Title : test
4+
# Description : test
5+
# Owner : icinga
6+
# AddToMenu : yes
7+
# Statetype : soft
8+
#
9+
###################################
10+
11+
test2 =
12+
display 1;test2;test2
13+
webserver =
14+
display 1;webserver;webserver

roles/icingadb/tasks/manage_schema_mysql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-p"{{ icingadb_database_password }}"
1313
"{{ icingadb_database_name | default('icingadb') }}"
1414
15-
- name: MySQL check for IDO schema
15+
- name: MySQL check for IcingaDB schema
1616
ansible.builtin.shell: >
1717
{{ mysqlcmd }}
1818
-Ns -e "select version from icingadb_schema"
@@ -21,7 +21,7 @@
2121
check_mode: false
2222
register: _db_schema
2323

24-
- name: MySQL import IDO schema
24+
- name: MySQL import IcingaDB schema
2525
ansible.builtin.shell: >
2626
{{ mysqlcmd }}
2727
< {{ icingadb_database_schema }}

roles/icingadb/tasks/manage_schema_pgsql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{% if icingadb_database_key is defined %} sslkey={{ icingadb_database_key }} {%- endif %}
1717
{% if icingadb_database_ssl_extra_options is defined %} {{ icingadb_database_ssl_extra_options }} {%- endif %}"
1818
19-
- name: PgSQL check for DB schema
19+
- name: PgSQL check for IcingaDB schema
2020
ansible.builtin.shell: >
2121
{{ _tmp_pgsqlcmd }}
2222
-w -c "select version from icingadb_schema"
@@ -25,7 +25,7 @@
2525
check_mode: false
2626
register: _db_schema
2727

28-
- name: PgSQL import DB schema
28+
- name: PgSQL import IcingaDB schema
2929
ansible.builtin.shell: >
3030
{{ _tmp_pgsqlcmd }}
3131
-w -f {{ icingadb_database_schema }}

roles/icingadb_redis/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ icingadb_redis_packages:
1010
icingadb_redis_protected_mode: 'yes'
1111
icingadb_redis_binds:
1212
- "127.0.0.1"
13-
- "::1"
13+
- "-::1"
1414
icingadb_redis_port: 6380
1515
icingadb_redis_tcp_backlog: 511
1616
icingadb_redis_timeout: 0

roles/icingaweb2/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ icingaweb2_config:
2828
global:
2929
show_stacktraces: 1
3030
show_application_state_messages: 1
31-
config_backend: ini
31+
config_resource: icingaweb2_db
3232
module_path: /usr/share/icingaweb2/modules
3333
logging:
3434
log: syslog

0 commit comments

Comments
 (0)