Add prometheus view to ad hoc metrics #1677
Merged
Conversation
This file contains 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
|
@miq-bot add_label compute/containers wip because it requires: ManageIQ/manageiq-providers-kubernetes#71 @simon3z @cben @moolitayer @nimrodshn please review |
yaacov
force-pushed
the
add-prometheus-ad-hoc-metrics
branch
2 times, most recently
from
135dd85
to
844a0c0
Compare
yaacov
force-pushed
the
add-prometheus-ad-hoc-metrics
branch
from
844a0c0
to
e6e88a3
Compare
|
This pull request is not mergeable. Please rebase and repush. |
yaacov
force-pushed
the
add-prometheus-ad-hoc-metrics
branch
from
e6e88a3
to
1fc036f
Compare
yaacov
changed the title
|
ManageIQ/manageiq-providers-kubernetes#71 is merged @simon3z @nimrodshn @zeari @himdel please review |
yaacov
force-pushed
the
add-prometheus-ad-hoc-metrics
branch
from
1fc036f
to
32fc71f
Compare
|
cc @ilackarms this PR is updated |
|
@joelddiaz this is our take on Prometheus metrics view in Manageiq, please review cc @simon3z |
|
tested working. LGTM! |
himdel
reviewed
Aug 25, 2017
| @@ -78,7 +82,7 @@ def data(query) | |||
| rescue StandardError => e | |||
| { | |||
| :parameters => params, | |||
| :error => ActionView::Base.full_sanitizer.sanitize(e.to_s) + " " + _("(Please check your Hawkular server)") | |||
| :error => ActionView::Base.full_sanitizer.sanitize(e.to_s) + " " + _("(Please check your #{@db_name} server)") | |||
There was a problem hiding this comment.
This can't work, you need to _("(Please check your %{type} server)") % {:type => @db_name}
There was a problem hiding this comment.
👍 Thanks, I do not think i18n ... , copied your fix :-)
There was a problem hiding this comment.
:) The only thing to keep it in mind really is that the _ function can only translate it if it finds an exact match in its db. So any interpolation has to be done on the result of _, not before.
himdel
reviewed
Aug 25, 2017
| jobs.map { |id| { :label => labelize(id), :value => id } } | ||
| end | ||
|
|
||
| def add_last_readings(metrics) |
There was a problem hiding this comment.
Dead method? (Or just useless? :))
There was a problem hiding this comment.
👍 done, moved implementation to parent class
himdel
reviewed
Aug 25, 2017
| "default" => "Default", | ||
| "admin" => "Admin", | ||
| "openshift-infra" => "OpenShift Infra" | ||
| "_system" => "System", |
There was a problem hiding this comment.
any chance these should be translated?
|
@yaacov Trying to test in ui, but the current set-miq-providers fails with Can you take a look please? From evm.log: (And the old provider showed a long message about it not being available, but I can't get to it again, sorry.) |
sorry, all my machines are down/broken because for bad openshit 3.7 images ..., re-spinning 3.6 images now, will ping you when they will be running. |
|
@himdel ^^ |
yaacov
force-pushed
the
add-prometheus-ad-hoc-metrics
branch
from
32fc71f
to
ef8a881
Compare
|
first machine is up (with prometheus metrics) working on the |
|
Checked commits yaacov/manageiq-ui-classic@6db8abe~...b1ea37f with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
|
@himdel what to do about codeclimate ? |
|
@yaacov No need to do anything, the threshold is set too low for ruby (18), we were discussing increasing the threshold today .. Cc @martinpovolny: mass 25 is definitely too low :) and are definitely not similar enough :). |
|
Tested in the UI, LGTM :) |
ZitaNemeckova
added a commit
to ZitaNemeckova/manageiq-ui-classic
that referenced
this pull request
Apr 18, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Add Prometheus as an external data source
Screenshot
