Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Custom Prometheus exporter configuration #93

Merged
merged 15 commits into from
May 12, 2020
Merged

Custom Prometheus exporter configuration #93

merged 15 commits into from
May 12, 2020

Conversation

shubhanilBag
Copy link
Contributor

This PR:

  1. Modifies operator to use a user created Config Map to add custom configuration for the prometheus exporter.
  2. Updated docs and templates

JIRA: https://jira.d2iq.com/browse/D2IQ-60293

@shubhanilBag shubhanilBag self-assigned this Apr 29, 2020
zmalik
zmalik suggested changes May 4, 2020
View reviewed changes
Copy link
Contributor

@zmalik zmalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good!
I would only ask for one cosmetical addition in docs around skip_properties

docs/monitoring.md Show resolved Hide resolved
ANeumann82
ANeumann82 approved these changes May 4, 2020
View reviewed changes
Copy link
Contributor

@ANeumann82 ANeumann82 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, I agree with the skip_properties should get listed in the documentation, so users know which ones can't get overridden.

@shubhanilBag shubhanilBag requested a review from zmalik May 5, 2020 10:21
@zmalik
Copy link
Contributor

zmalik commented May 5, 2020

@shubhanilBag you need to run

tools/docker.sh tools/compile_templates.sh
tools/docker.sh tools/generate_parameters_markdown.py
tools/docker.sh tools/format_files.sh

and commit any changes done indocs/monitoring.md and docs/parameters.md

@shubhanilBag
Updated operator to accept custom exporter config
cc9c6d2 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
Updated docs
bd7e580 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
Updated templates
23ddb63 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
Updated docs
fe22458 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
fix doc format checks
a8fe714 
Signed-off-by: Shubhanil Bag <[email protected]>
zmalik
zmalik approved these changes May 5, 2020
View reviewed changes
Copy link
Contributor

@zmalik zmalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@shubhanilBag
Updated operator to accept custom exporter config
8f0562f 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
Updated docs
2a4e569 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
Updated templates
2e767c2 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
Updated docs
be8db00 
Signed-off-by: Shubhanil Bag <[email protected]>
@shubhanilBag
fix doc format checks
5fb4deb 
Signed-off-by: Shubhanil Bag <[email protected]>
shubhanilBag and others added 5 commits May 7, 2020 12:05
@shubhanilBag
Fix parameters.md
8738f86 
Signed-off-by: Shubhanil Bag <[email protected]>
@ANeumann82
Merge branch 'master' into nil/custom-exporter-config
500c01d
@ANeumann82
Updated parameters
475139c 
Signed-off-by: Andreas Neumann <[email protected]>
@ANeumann82
Merge remote-tracking branch 'origin/nil/custom-exporter-config' into…
98ae948 
… nil/custom-exporter-config

# Conflicts:
#	docs/parameters.md
@ANeumann82
Updated parameters
cc3b4d5 
Signed-off-by: Andreas Neumann <[email protected]>
@ANeumann82 ANeumann82 merged commit 14f5fe6 into master May 12, 2020
@ANeumann82 ANeumann82 deleted the nil/custom-exporter-config branch May 12, 2020 14:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ANeumann82 ANeumann82 ANeumann82 approved these changes

@zmalik zmalik zmalik approved these changes

@nfnt nfnt Awaiting requested review from nfnt

Assignees

@shubhanilBag shubhanilBag

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shubhanilBag @zmalik @ANeumann82