Skip to content

Fix for #1144 #1189

Merged
HenriWahl merged 18 commits into
HenriWahl:next_develfrom
Simkimdm:#1144-zabbix-fix
Mar 7, 2026
Merged

Fix for #1144 #1189
HenriWahl merged 18 commits into
HenriWahl:next_develfrom
Simkimdm:#1144-zabbix-fix

Conversation

@Simkimdm
Copy link
Copy Markdown
Contributor

@Simkimdm Simkimdm commented Mar 6, 2026

prevent overwriting hosts, collect multiple alerts per host.

@Simkimdm
Copy link
Copy Markdown
Contributor Author

Simkimdm commented Mar 6, 2026

fix for #1144 and #1189

@HenriWahl HenriWahl changed the base branch from master to next_devel March 7, 2026 11:07
@HenriWahl HenriWahl merged commit dbe08f8 into HenriWahl:next_devel Mar 7, 2026
2 checks passed
@HenriWahl
Copy link
Copy Markdown
Owner

@Simkimdm thank you for the fast fix!

HenriWahl added a commit that referenced this pull request Mar 7, 2026
* readd nagstamon.1.gz

* readd nagstamon.1.gz

* fixes issues with Alertmanager and Prometheus (#1184)

* fix(Alertmanager/Prometheus): Ensure session is not None before updating headers for JSON

* fix(Alertmanager/Prometheus): service key issue with display_name from UI and multiple little fixes

* fix CREDITS

* fix cookies.py for python3.9

* build -> dist

* fixed windows signing

* add test for python 3.9

* updae codeql.yml

* fix fedora/rhel repo

* --depth 1

* ${{ env.cr_image }}-${{ env.family }}-${{ env.version_latest }}:${{ steps.dockerfile_hash.outputs.HASH }}

* ${{ env.cr_image }}-${{ env.family }}-${{ env.version_latest }}:${{ steps.dockerfile_hash.outputs.HASH }} part II

* rhel version

* rhel version part II

* fixed fedora repo

* prevent duplicate host creation in Zabbix.py

* refactor Zabbix.py for improved readability and error handling, fix #1186

---------

Co-authored-by: HenriWahl <2835065+HenriWahl@users.noreply.github.com>
Co-authored-by: Stephan Schwarz <22387558+stearz@users.noreply.github.com>
Co-authored-by: Kimmig, Simon - D0242573 <simon.kimmig@dm.de>
HenriWahl added a commit that referenced this pull request Mar 10, 2026
* readd nagstamon.1.gz

* readd nagstamon.1.gz

* fixes issues with Alertmanager and Prometheus (#1184)

* fix(Alertmanager/Prometheus): Ensure session is not None before updating headers for JSON

* fix(Alertmanager/Prometheus): service key issue with display_name from UI and multiple little fixes

* fix CREDITS

* fix cookies.py for python3.9

* build -> dist

* fixed windows signing

* add test for python 3.9

* updae codeql.yml

* fix fedora/rhel repo

* --depth 1

* ${{ env.cr_image }}-${{ env.family }}-${{ env.version_latest }}:${{ steps.dockerfile_hash.outputs.HASH }}

* ${{ env.cr_image }}-${{ env.family }}-${{ env.version_latest }}:${{ steps.dockerfile_hash.outputs.HASH }} part II

* rhel version

* rhel version part II

* fixed fedora repo

* prevent duplicate host creation in Zabbix.py

* refactor Zabbix.py for improved readability and error handling, fix #1186

---------

Co-authored-by: HenriWahl <2835065+HenriWahl@users.noreply.github.com>
Co-authored-by: Stephan Schwarz <22387558+stearz@users.noreply.github.com>
Co-authored-by: Kimmig, Simon - D0242573 <simon.kimmig@dm.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants