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

add support for icingadb as only icingaweb2 data backend #2635

Merged
merged 22 commits into from
Jan 16, 2024
Merged

add support for icingadb as only icingaweb2 data backend #2635

merged 22 commits into from
Jan 16, 2024

Conversation

EmTeedee
Copy link
Contributor

@EmTeedee EmTeedee commented Oct 12, 2022 •
edited
Loading

Hi,

we're using icingadb exclusively and I wanted director to be integrated properly.
I've tested this PR with only icingadb, only monitoring and both enabled.

fixes #2533
fixes #2563

Tobias

@cla-bot cla-bot bot added the cla/signed label Oct 12, 2022
@EmTeedee
Copy link
Contributor Author

@Thomas-Gelf could you comment on this PR and let me know if I need to make any changes?
I'm not super happy with the MonitorBackend interface, but not sure how to handle that better.

@mwaldmueller
Copy link

mwaldmueller commented Nov 22, 2022 •
edited
Loading

@Thomas-Gelf Any news on this? Problem still exists with icingadb-web v1.0.2 and director v1.10.2

@Yoda-BZH
Copy link

Hello,

Any update ? Thank you !

@sukhwinder33445
Copy link
Contributor

sukhwinder33445 commented Nov 13, 2023 •
edited
Loading

Hi @EmTeedee,

Sorry for the late reply. I'd love to give you some code reviews/comments, so we can merge this branch as soon as possible. However, many changes have been made to the base branch since the last commit, so this branch must first be rebased with master branch in order to resolve the conflicts.
Are you still interested in fixing these conflicts and making some more code changes when I review the code? Otherwise, I can make the further changes myself.

@sukhwinder33445 sukhwinder33445 force-pushed the icingadb-support-2533 branch 3 times, most recently from 6f94474 to 7cea76b Compare November 15, 2023 14:43
@EmTeedee
Copy link
Contributor Author

EmTeedee commented Nov 15, 2023 •
edited
Loading

@sukhwinder33445 I currently can't spare the time. We're very busy at work...
I'd appreciate if you can take this forward.

@sukhwinder33445
Copy link
Contributor

Thank you for your reply @EmTeedee. Then I will take over from now on.

@sukhwinder33445 sukhwinder33445 force-pushed the icingadb-support-2533 branch 2 times, most recently from aef4f87 to cbf4541 Compare November 21, 2023 12:10
@sukhwinder33445 sukhwinder33445 self-assigned this Nov 21, 2023
@sukhwinder33445 sukhwinder33445 force-pushed the icingadb-support-2533 branch 5 times, most recently from 41563d2 to 14996f5 Compare November 21, 2023 14:49
@sukhwinder33445 sukhwinder33445 mentioned this pull request Nov 21, 2023
Merged
nilmerg
nilmerg requested changes Jan 15, 2024
View reviewed changes
phpstan.neon Show resolved Hide resolved
library/Director/Web/Controller/ActionController.php Outdated Show resolved Hide resolved
library/Director/Integration/MonitoringModule/Monitoring.php Outdated Show resolved Hide resolved
configuration.php Outdated Show resolved Hide resolved
configuration.php Outdated Show resolved Hide resolved
library/Director/Integration/Icingadb/IcingadbBackend.php Outdated Show resolved Hide resolved
library/Director/Integration/Icingadb/IcingadbBackend.php Outdated Show resolved Hide resolved
@sukhwinder33445
Remove obsolate class Backend and its usages
89134e0 
- Create the backend directly in ActionController::backend()
- Simplify the code
@sukhwinder33445
Cleanup code
956cce8 
- Remove superfluous methods/usages
- Simplify the code
@sukhwinder33445
Monitoring/IcingadbBackend: Handle if $hostName or $serviceName is null
677f5dc
@sukhwinder33445
IcingadbBackend: Always check if module is available
eeaf877
@sukhwinder33445
Backend: Remove unnecessary calls to isAvailable()
db7181c
@sukhwinder33445
Introduce icingadb permissions/restrictions
a272b0d
@sukhwinder33445
configuration.php: Only provide monitoring/icingadb permissions/restr…
1048c33 
…ictions if module exists
@sukhwinder33445
Icingadb (Host/Service)Actions: Fix permissions and code style
26f8769
@sukhwinder33445
ServiceController: Remove redudant if condition
4e6528e
@sukhwinder33445
HostController: Move ServiceFinder::getRedirectionUrl() method code t…
8a489bc 
…o findserviceAction()

- This helps to detect backend easily, and was only called in this method anyway.
- Add and use helping method getServicesReadOnlyPermission()
-
@sukhwinder33445
IcingadbBackend: Apply director restrictions properly
f52d05d
@sukhwinder33445
ActionController::backend(): Add condition to check which backend sho…
4ef7f56 
…uld be used

- If both are available
@sukhwinder33445
ServiceController: Use given properties to get host/service name
d26a619
@sukhwinder33445
Fix phpcs issues
d30a56a
@sukhwinder33445
phpstan: Add icingadb module
147170e
@sukhwinder33445
IcingadbBackend: Drop icingadb restriction check and only check for d…
2461724 
…irector restrictions

Monitoring does the same.
@sukhwinder33445
IcingadbBackend: Remove isAvailable method and property
a850ff1 
As it is only used internally now, it is no more required
@nilmerg nilmerg added the bug label Jan 16, 2024
@nilmerg nilmerg added this to the v1.11.1 milestone Jan 16, 2024
@nilmerg nilmerg linked an issue Jan 16, 2024 that may be closed by this pull request
"show" link missing from host configuration page with icingadb #2770
Closed
@nilmerg nilmerg added the ref/IP label Jan 16, 2024
@nilmerg nilmerg merged commit 6851778 into Icinga:master Jan 16, 2024
15 checks passed
@nilmerg nilmerg removed the request for review from raviks789 January 16, 2024 10:16
@EmTeedee EmTeedee deleted the icingadb-support-2533 branch January 16, 2024 10:17
@EmTeedee EmTeedee restored the icingadb-support-2533 branch January 16, 2024 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sukhwinder33445 sukhwinder33445 sukhwinder33445 left review comments

@nilmerg nilmerg nilmerg approved these changes

Assignees

@sukhwinder33445 sukhwinder33445

Labels
bug cla/signed ref/IP
Projects
None yet
Milestone
v1.11.1
5 participants
@EmTeedee @mwaldmueller @Yoda-BZH @sukhwinder33445 @nilmerg