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

Added subpath("/grafana") in grafana root_url for reverse proxy #578

Merged
merged 4 commits into from
Nov 5, 2018
Merged

Added subpath("/grafana") in grafana root_url for reverse proxy #578

merged 4 commits into from
Nov 5, 2018

Conversation

GowthamShanmugam
Copy link
Collaborator

bugzilla: 1590416
tendrl-bug-id: #577

Signed-off-by: GowthamShanmugam [email protected]

@GowthamShanmugam
Added subpath in grafana root_url for reverse proxy
b32cf80 
bugzilla: 1590416
tendrl-bug-id: Tendrl#577

Signed-off-by: GowthamShanmugam <[email protected]>
@GowthamShanmugam GowthamShanmugam requested a review from a team as a code owner October 1, 2018 08:11
@GowthamShanmugam
Copy link
Collaborator Author

@shtripat @gnehapk @shirshendu @mbukatov please review

shtripat
shtripat reviewed Oct 1, 2018
View reviewed changes
Copy link
Member

@shtripat shtripat 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

@GowthamShanmugam
Redirecting all api call via proxy pass
b021f5c 
bugzilla: 1590416
tendrl-bug-id: Tendrl#577

Signed-off-by: GowthamShanmugasundaram <[email protected]>
@codecov
Copy link

codecov bot commented Oct 5, 2018 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@ecf7299). Click here to learn what that means.
The diff coverage is 17.85%.

Impacted file tree graph

@@           Coverage Diff            @@
##             master    #578   +/-   ##
========================================
  Coverage          ?   44.1%           
========================================
  Files             ?      41           
  Lines             ?    2351           
  Branches          ?     352           
========================================
  Hits              ?    1037           
  Misses            ?    1261           
  Partials          ?      53
Impacted Files Coverage Δ
...monitoring_integration/grafana/datasource_utils.py 31.91% <ø> (ø)
.../monitoring_integration/objects/config/__init__.py 100% <ø> (ø)
tendrl/monitoring_integration/graphite/__init__.py 8.01% <ø> (ø)
tendrl/monitoring_integration/grafana/utils.py 27.58% <ø> (ø)
tendrl/monitoring_integration/sync/__init__.py 27.45% <ø> (ø)
...onitoring_integration/grafana/grafana_org_utils.py 20.31% <0%> (ø)
tendrl/monitoring_integration/grafana/dashboard.py 18.33% <0%> (ø)
...toring_integration/grafana/notification_channel.py 55.55% <0%> (ø)
...nitoring_integration/upgrades/delete_dashboards.py 0% <0%> (ø)
.../monitoring_integration/grafana/dashboard_utils.py 27.27% <0%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ecf7299...ee8b57c. Read the comment docs.

@GowthamShanmugam
Copy link
Collaborator Author

@shtripat @anmolsachan @nthomas-redhat @cloudbehl please review

@mbukatov mbukatov mentioned this pull request Oct 24, 2018
Closed
GowthamShanmugam
GowthamShanmugam commented Oct 31, 2018
View reviewed changes
tendrl/monitoring_integration/grafana/alert_organization.py
@@ -64,15 +64,15 @@ def create_organization():
resp = json.loads(resp)
if "id" in resp:
org_id = resp['id']
msg = ("alert organization with name %s " +
msg = ("alert organization with name %s "
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

as per pep8 check, we don't need to give + symbol in between brackets for string concatenation

@GowthamShanmugam
Fixing pep8 issue
22ed612 
bugzilla: 1590416
tendrl-bug-id: Tendrl#577

Signed-off-by: GowthamShanmugam <[email protected]>
@GowthamShanmugam
Fixing testcase
ee8b57c 
bugzilla: 1590416
tendrl-bug-id: Tendrl#577

Signed-off-by: GowthamShanmugasundaram <[email protected]>
shtripat
shtripat approved these changes Oct 31, 2018
View reviewed changes
Copy link
Member

@shtripat shtripat 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. Hope all this is tested.

@GowthamShanmugam
Copy link
Collaborator Author

It is verified

@GowthamShanmugam
Copy link
Collaborator Author

@nthomas-redhat please review and merge this PR

@nthomas-redhat nthomas-redhat merged commit 615ce4a into Tendrl:master Nov 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shtripat shtripat shtripat approved these changes

@nthomas-redhat nthomas-redhat nthomas-redhat approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GowthamShanmugam @nthomas-redhat @shtripat