Skip to content

Commit

Permalink
fix(disco): adapt paths and whitelist to new autodisco script location (
Browse files Browse the repository at this point in the history 
#1748)
  • Loading branch information
@kduret
kduret authored Oct 7, 2024
1 parent 994c5d7 commit 371ffac
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion gorgone/config/gorgoned-central-ssh.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ configuration:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: proxy
Expand Down
2 changes: 1 addition & 1 deletion gorgone/config/gorgoned-central-zmq.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ configuration:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: proxy
Expand Down
2 changes: 1 addition & 1 deletion gorgone/config/gorgoned-poller.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ configuration:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: engine
Expand Down
2 changes: 1 addition & 1 deletion gorgone/config/gorgoned-remote-ssh.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ configuration:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: proxy
Expand Down
2 changes: 1 addition & 1 deletion gorgone/config/gorgoned-remote-zmq.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ configuration:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: proxy
Expand Down
2 changes: 1 addition & 1 deletion gorgone/contrib/gorgone_config_init.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ sub write_gorgone_config {
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$
- name: proxy
Expand Down
2 changes: 1 addition & 1 deletion gorgone/docs/api/gorgone-openapi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ components:
command_line:
type: string
description: "Command line to execute"
example: "/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host --job-id=14"
example: "/usr/share/centreon/bin/run_save_discovered_host --job-id=14"
required:
- job_id
- target
Expand Down
4 changes: 2 additions & 2 deletions gorgone/docs/api/index.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gorgone/docs/migration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ configuration:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: cron
Expand Down
4 changes: 2 additions & 2 deletions gorgone/docs/modules/centreon/autodiscovery.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ curl --request POST "https://hostname:8443/api/centreon/autodiscovery/hosts" \
\"commands\": [
{
\"action\": \"COMMAND\",
\"command_line\": \"/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host --job-id=14\"
\"command_line\": \"/usr/share/centreon/bin/run_save_discovered_host --job-id=14\"
}
]
}
Expand Down Expand Up @@ -177,7 +177,7 @@ curl --request POST "https://hostname:8443/api/centreon/autodiscovery/hosts" \
\"commands\": [
{
\"action\": \"COMMAND\",
\"command_line\": \"/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host --job-id=14\"
\"command_line\": \"/usr/share/centreon/bin/run_save_discovered_host --job-id=14\"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion gorgone/docs/modules/core/action.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ allowed_cmds:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$
```
Expand Down
2 changes: 1 addition & 1 deletion gorgone/docs/poller_pull_configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gorgone:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: engine
Expand Down
2 changes: 1 addition & 1 deletion gorgone/docs/poller_pullwss_configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ gorgone:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: engine
Expand Down
2 changes: 1 addition & 1 deletion gorgone/docs/rebound_configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ gorgone:
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$

- name: engine
Expand Down
2 changes: 1 addition & 1 deletion gorgone/packaging/configuration/whitelist.conf.d/centreon.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- ^/usr/bin/php -q /usr/share/centreon/cron/centreon-helios\.php >> /var/log/centreon-helios\.log 2>&1\s*$
- ^centreon
- ^mkdir
- ^/usr/share/centreon/www/modules/centreon-autodiscovery-server/script/run_save_discovered_host
- ^/usr/share/centreon/(www/modules/centreon-autodiscovery-server/script|bin)/run_save_discovered_host
- ^/usr/share/centreon/bin/centreon -u \"centreon-gorgone\" -p \S+ -w -o CentreonWorker -a processQueue$
- ^/usr/bin/php (-q )?/usr/share/centreon/cron/[\w,\s.-]+ >> /var/log/centreon-gorgone/[\w,\s.-]+\s+2>&1$
- ^/usr/bin/php -q /usr/share/centreon/www/modules/centreon-bi-server/tools/purgeArchivesFiles\.php >> /var/log/centreon-gorgone/centreon-bi-archive-retention\.log 2>&1$
Expand Down

1 comment on commit 371ffac

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
8 1 0 9 88.89 4m49.362913s

Failed Tests

Name Message ⏱️ Duration Suite
EBDP7 There are 3 running pollers.: () != ((3,),) 6.350 s Delete-Poller

Please sign in to comment.