Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SOC-3529 add support for pd merging #10

Merged
merged 14 commits into from
Jul 28, 2023
Merged

SOC-3529 add support for pd merging #10

merged 14 commits into from
Jul 28, 2023

Commits on Jul 24, 2023

  1. Add comment explaining how the different pieces fit together, and sta… 

    …rt renaming things to use correct terms...
    @eric-eisenhart
    eric-eisenhart committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    7bb15df View commit details
    Browse the repository at this point in the history

  2. Rename zabbix_get_event_id to zabbix_get_Event_id_from_pd_object and 

    (try to) make it smart enough to pull an eventid from either an alert or an
incident.
    @eric-eisenhart
    eric-eisenhart committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    ec2d3c2 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Minimum viable code (it ACK'd two zabbix events that were part of a s… 

    …ingle merged PD incident).
    @eric-eisenhart
    eric-eisenhart committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    8cb8a22 View commit details
    Browse the repository at this point in the history

  2. Attempt to fallback to old mechanism if /alerts end-point didn't work...

    @eric-eisenhart
    eric-eisenhart committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    f6552e8 View commit details
    Browse the repository at this point in the history

  3. It actually works now. Merges the events properly in Zabbix. 

    - Switched JSON encoding to using a JSON object instead of imported `to_json` so can "allow_blessed" for all json stuff.
- Added a bunch of debugging stuff, including every func outputting its arguments on every call if DEBUG>=5.
- Added logic and a couple functions for merging Zabbix events when PD incidents merge.
    @eric-eisenhart
    eric-eisenhart committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    dbfa678 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Style fixups with perltidy

    @eric-eisenhart
    eric-eisenhart committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    f756d22 View commit details
    Browse the repository at this point in the history

  2. Another pass with (newer version of) perltidy.

    @eric-eisenhart
    eric-eisenhart committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    a860412 View commit details
    Browse the repository at this point in the history

  3. Add a dependency blocking LWP from installing on perl 5.10 pipeline

    @eric-eisenhart
    eric-eisenhart committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4ea04a4 View commit details
    Browse the repository at this point in the history

  4. Try to get a lower version of a dependency module when compile testin… 

    …g for perl 5.10
    @eric-eisenhart
    eric-eisenhart committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    ddc30d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Added configurable option for how to handle incoming merge events

    @eric-eisenhart
    eric-eisenhart committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    7d0732b View commit details
    Browse the repository at this point in the history

  2. Update documentation and example config to reflect feature changes. 

    Also a bit of just general docs/example improvements while I was in there.
    @eric-eisenhart
    eric-eisenhart committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    7fd1c0a View commit details
    Browse the repository at this point in the history

  3. Minor perltidy fixes.

    @eric-eisenhart
    eric-eisenhart committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    cabce59 View commit details
    Browse the repository at this point in the history

  4. Remove the attempt to validate the pdmergeaction option; it wasn't wo… 

    …rking

and doesn't add enough value to be worth digging into further (anything
other than `merge` or `resolve` gets treated same as `ignore`).

And a tiny bit more debugging.
    @eric-eisenhart
    eric-eisenhart committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    6a54712 View commit details
    Browse the repository at this point in the history

  5. Minor formatting fixup via perltidy

    @eric-eisenhart
    eric-eisenhart committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    0603ea2 View commit details
    Browse the repository at this point in the history