Skip to content
New issue

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

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

Already on GitHub? # to your account

Make graphite path wildcards work #267

Merged
merged 3 commits into from
Mar 22, 2022
Merged

Conversation

sukhwinder33445
Copy link
Contributor

@sukhwinder33445 sukhwinder33445 commented Mar 10, 2022

resolves #220

@sukhwinder33445 sukhwinder33445 requested a review from nilmerg March 10, 2022 17:13
@sukhwinder33445 sukhwinder33445 self-assigned this Mar 10, 2022
@cla-bot cla-bot bot added the cla/signed label Mar 10, 2022
@sukhwinder33445
Copy link
Contributor Author

sukhwinder33445 commented Mar 11, 2022

Tests:

Tested with the users.ini file. Changed the [users.metrics_filters] for tests.

users = "$service_name_template$.perfdata.us[a-z]rs.value"
users = "$service_name_template$.perfdata.u[sd]ers.value"
users = "$service_name_template$.perfdata.{uders,users,umers}.value"
users = "$service_name_template$.perfdata.us*rs.value"
users = "$service_name_template$.perfdata.us*rs.va*"
users = "$service_name_template$.perfdata.*.va*"

library/Graphite/Graphing/GraphiteWebClient.php Outdated Show resolved Hide resolved
library/Graphite/Util/MacroTemplate.php Outdated Show resolved Hide resolved
@sukhwinder33445 sukhwinder33445 force-pushed the make-graphite-path-wildcards-work branch 4 times, most recently from ae545ae to 8efea1b Compare March 17, 2022 08:53
@sukhwinder33445 sukhwinder33445 force-pushed the make-graphite-path-wildcards-work branch from 69452bd to 15ed324 Compare March 21, 2022 12:26
@sukhwinder33445
Copy link
Contributor Author

sukhwinder33445 commented Mar 21, 2022

Tests:

Tested with the disk.ini file. Changed the [users.metrics_filters] for tests.

✅ value = "$service_name_template$.perfdata.$disk:{_etc_hostname,_data}$.value"
✅ value = "$service_name_template$.perfdata.$disk:{_etc*,_data}$.value"
✅ value = "$service_name_template$.perfdata.$disk:{_et[abc]_hostname,_data}$.value"
✅ value = "$service_name_template$.perfdata.$disk$.value"

@sukhwinder33445 sukhwinder33445 force-pushed the make-graphite-path-wildcards-work branch 2 times, most recently from cc26c49 to f787b54 Compare March 21, 2022 16:10
@sukhwinder33445 sukhwinder33445 requested a review from nilmerg March 21, 2022 16:15
library/Graphite/Util/MacroTemplate.php Outdated Show resolved Hide resolved
doc/04-Templates.md Outdated Show resolved Hide resolved
doc/04-Templates.md Outdated Show resolved Hide resolved
doc/04-Templates.md Outdated Show resolved Hide resolved
@sukhwinder33445 sukhwinder33445 force-pushed the make-graphite-path-wildcards-work branch from f787b54 to 84275a3 Compare March 21, 2022 16:28
@sukhwinder33445 sukhwinder33445 requested a review from nilmerg March 21, 2022 16:28
@nilmerg nilmerg added enhancement New feature or improvement area/templates Affects the graphite templates labels Mar 21, 2022
@nilmerg nilmerg added this to the v1.2.0 milestone Mar 21, 2022
@nilmerg nilmerg merged commit 10c7378 into master Mar 22, 2022
@nilmerg nilmerg deleted the make-graphite-path-wildcards-work branch March 22, 2022 10:41
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
area/templates Affects the graphite templates cla/signed enhancement New feature or improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Url Encode fails on [] range chars
3 participants