dird: status subscriptions shows more details about subscription units#989
Merged
pstorz merged 20 commits intobareos:masterfrom Dec 16, 2021
Conversation
3ec3432 to
07d9090
Compare
8a8d51f to
d83d5d6
Compare
3583086 to
0201baa
Compare
0201baa to
9233618
Compare
Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
Add the queries to catalog dml Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
- Version 2210 include new subscription views - Add postgresql update 2192 to 2210 sql - Run create_queryfiles.sh - Rename dml sql script to normalized name Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
Now displaying the data from the newly added queries Displays correct json format when on `api 2` mode
updated related files
9233618 to
dc8a306
Compare
As the original subscription counting is now obsolete, this patch removes it.
dc8a306 to
225c315
Compare
* by default only a summary is shown
* this also displays "remaining" units based on the configured
subscriptions
* keyword "detail" shows clients/filesets
* keyword "unknown" shows uncategorized data
* keyword "all" shows a complete report
* document the new features of status subscriptions * promote status scheduler, status subscription and status configuration to have their own sections
48bae26 to
436079b
Compare
status subscriptions shows more details about subscriptions and units data
status subscriptions shows more details about subscriptions and units datastatus subscriptions shows more details about subscription units
pstorz
requested changes
Dec 16, 2021
Member
pstorz
left a comment
There was a problem hiding this comment.
bareos-check-sources is sad about some files, I guess we will have to exclude the .txt files, right?
Plugin 'clang-format check' would modify 'core/src/dird/dird_conf.h'
Plugin 'clang-format check' would modify 'core/src/dird/ua_status.cc'
Plugin 'cmake format' would modify 'systemtests/tests/bareos/CMakeLists.txt'
Plugin 'trailing newlines' would modify 'systemtests/tests/bareos/expected/status-subscriptions-detail.txt'
Plugin 'trailing newlines' would modify 'systemtests/tests/bareos/expected/status-subscriptions.txt'
pstorz
approved these changes
Dec 16, 2021
Change the test system:bareos:status-subscription to check the new status subscription command. Also leverage fixtures in system:bareos so we only run one backup for all tests instead of one per test.
Access to `status subscription` now requires access to the configure command. This works just like for `status configuration`.
060835d to
863a83e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description:
This PR aims to improve the
status subscriptionscommand and show more details to the user, as well as making it available as JSON using.api 2. Improvements were inspired from the status-subscription script solution.Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
General
Source code quality
bareos-check-sources --since-mergedoes not report any problemsgit statusshould not report modifications in the source tree after building and testingTests