Commit graph

93 commits

Author SHA1 Message Date
Kevin Fenzi
60c4bdd9d0 zabbix / templates: just use inventory_hostname not short
This causes an issue where we have a proxy01.iad2 and a proxy01.rdu3.
They are different hosts, but if it uses the short name then the second
one fails because it has the same name as the first.

Lets just use fqdn for now and see if causes any problems in
display in the interface. If it does, we can change it to
perhaps include the second octet.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2025-05-28 15:48:03 -07:00
Greg Sutcliffe
634f70c457
Zabbix-stg: Enable setting host-level overrides to template macros 2025-05-01 15:06:17 +01:00
Greg Sutcliffe
3965fb9a04
zabbix-stg: add missing tag to needed set_fact 2025-04-29 20:46:37 +01:00
Greg Sutcliffe
0e60fc6eaf Zabbix-stg: bump collection to 3.3.0 and re-enable user 2025-04-24 17:29:01 +00:00
Greg Sutcliffe
f5475063e6 Zabbix-stg: disable user-management until we can upgrade to 3.3.0 2025-04-04 16:31:47 +01:00
Greg Sutcliffe
655f2dc58f Zabbix-stg: minor fixes to API config 2025-04-04 12:25:57 +00:00
Greg Sutcliffe
7f60fdf690 Zabbix-stg: More base server config
This adds:
- Matrix media type
- User for a Matrix bot
- Trigger using Matrix & the bot
- PSK configuration, using the PSK file already deployed
- 2 base templates
  - a general one suitable even for Koji
  - a dependant one for all other hosts
- Autoregistration config to use the new base template

This is all scoped to staging via a new include in main.yml
2025-04-02 17:30:59 +01:00
2e078cde1c Update roles/zabbix/zabbix_server/tasks/install.yml - Updating Zabbix prod to 7.0LTS
Signed-off-by: Mark Rosenbaum markrosenbaum@fedoraproject.org
2025-03-14 16:18:35 +00:00
01f5e19cf6 Update roles/zabbix/zabbix_server/tasks/install.yml - Seperated Prod and Stg
Prod gets the same version it already has(6.0 LTS) and Stg now gets 7.0 LTS
2025-03-14 14:29:14 +00:00
81ee6adbe2 Update roles/zabbix/zabbix_server/tasks/install.yml - rpm install 6.0LTS to rpm install 7.0LTS 2025-03-14 14:29:14 +00:00
Michal Konecny
2ec055db6f Use first uppercase letter for all handlers
This will unify all the handlers to use first uppercase letter for
ansible-lint to stop complaining.

I went through all `notify:` occurrences and fixed them by running
```
set TEXT "text_to_replace"; set REPLACEMENT "replacement_text"; git grep
-rlz "$TEXT" . | xargs -0 sed -i "s/$TEXT/$REPLACEMENT/g"
```

Then I went through all the changes and removed the ones that wasn't
expected to be changed.

Fixes https://pagure.io/fedora-infrastructure/issue/12391

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
2025-02-10 20:31:49 +00:00
47c68f478d ansiblelint fixes - fqcn[action-core] - template to ansible.builtin.template
Replaces references to template: with ansible.builtin.template

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2025-01-15 11:30:29 +10:00
3c41882bb0 ansiblelint fixes - fqcn[action-core] - shell to ansible.builtin.shell
Replaces references to shell: with ansible.builtin.shell

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2025-01-15 11:29:10 +10:00
462176464b ansiblelint fixes-- fqcn[action-core] - command to ansible.builtin.command
Replaces many references to  command: with ansible.builtin.command

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2025-01-15 11:26:47 +10:00
6a3816dfdc ansiblelint fixes-- fqcn[action-core] - copy to ansible.builtin.copy
Replaces many references to 'copy' with ansible.builtin.copy

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2025-01-15 10:43:31 +10:00
62952df107 ansiblelint fixes-- fqcn[action-core] - file to ansible.builtin.file
Replaces many references to  file: with ansible.builtin.file

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2025-01-15 10:41:52 +10:00
691adee6ee Fix name[casing] ansible-lint issues
fix 1900 failures of the following case issue:

`name[casing]: All names should start with an uppercase letter.`

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2025-01-14 20:20:07 +10:00
Kevin Fenzi
e26f6acacf releng: drop clean-ami's job
This job was used to cleanup old ami's from fedimg.
It then reported to a pagure project about what it did.
However, it's token has been expired and it no longer needs to exist.
Garbage collection of ami's should take place in the new
cloud-image-uploader (well, it marks when things are eol).
So, lets just remove this old and nolonger needed cron.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-12-05 14:05:47 -08:00
041ac34bc2
update zabbix 6.0 LTS to latest
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-12-02 11:28:44 +00:00
89f6f1fc32 Fix majority of remaining yamllint warnings and errors
Signed-off-by: Ryan Lerch <rlerch@redhat.com>
2024-11-28 17:31:45 +10:00
Kevin Fenzi
967dc9ab91 zabbix: drop changes to /run dir
This was just added to help debug some startup problems, so we can drop
it now. Also, it causes the playbook to be non idempotent (ie, this task
runs and changes everytime the playbook it run, causing a lot of noise
in the check/diff runs).
/run/zabbix should get created by systemd, so no need to muck with it.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-10-09 08:52:25 -07:00
Jiri Podivin
f513e7cbcd Linting python scripts
Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
2024-09-18 19:57:29 +00:00
cb77d694fe
zabbix: move postgresql configuration to files rather than templates
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-05-16 11:39:16 +01:00
c7100e0259
zabbix: remove runonce flag from zabbix hostgroup creation task
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-05-16 09:30:41 +01:00
66defc189e
zabbix: attach monitoring template to rabbitmq
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-05-16 09:22:21 +01:00
321edb65cc
zabbix: external hosts http check updating config
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-29 12:05:12 +01:00
81ffe56f4a
zabbix: move https to http for proxies template
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-25 12:51:32 +01:00
4cfba84485
zabbix: retag tasks in zabbix_templates role
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-25 12:17:52 +01:00
0551f3f343
zabbix: add clearer ansible tags on zabbix_template role tasks
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-25 11:58:40 +01:00
9d97299285
zabbix: template to handle external hosts
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-25 11:26:49 +01:00
9cc8c5d489
zabbix: add external host https template
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-23 12:37:55 +01:00
68e1ca53a7
zabbix: put the zabbix postgresql config under sourcecontrol
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-04-16 11:12:04 +01:00
5db13988ce
zabbix: increase server conf CacheSize
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-21 15:52:23 +00:00
efa7047d3b
zabbix: remove set_facts, add vars to each api call
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-20 16:43:51 +00:00
9fe6ae04ad
zabbix: merging items and triggers in zabbix templates
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-19 12:58:28 +00:00
4b5fd84861
zabbix: modifing uuids in releng compose template
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-19 11:45:35 +00:00
41f8bc82e7
zabbix: break releng compose cronjob template into two parts
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-19 11:28:51 +00:00
f6d4ffc6f4
zabbix: minimise the json template
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-15 15:13:29 +00:00
364c6372d0
zabbix: update releng compose cronjob template hostnames
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-15 15:00:59 +00:00
02565b933e
zabbix: update releng compose cronjob template
re-enable zabbix/zabbix_template role on releng_compose

Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-15 04:02:33 +00:00
c7bf77dccc
zabbix: add tags to zabbix_agent tasks
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-14 12:54:33 +00:00
2f566d3c9a
zabbix: add hosts to hostgroup prior to template creation
move linking to template to separate task

Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 13:05:40 +00:00
f340a11c88
zabbix: configure hostgroup creation to run_once
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 12:57:15 +00:00
3c0a3f68e8
zabbix: reorder zabbix tasks, create hostgroup before templates
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 12:07:16 +00:00
1be7d658ab
zabbix: rename the template for releng compose cronjobs
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 11:57:43 +00:00
8ac96eb595
zabbix: move zabbix templates to role's base files directory
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 11:53:02 +00:00
0191fd7574
zabbix: add task to add hosts to zabbix hostgroup
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 11:42:49 +00:00
77c39f7d04
zabbix: Import hostgroup task correctly in main.yml
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 09:32:57 +00:00
bf5dcd8edb
zabbix: set releng_compose_stg zabbix_templates to empty list
add zabbix hostgroup create task

Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-13 09:29:56 +00:00
617b766423
zabbix: fix syntax error in file lookup
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
2024-02-12 13:47:37 +00:00