AMBARI-25379 Upgrade AMS Grafana version to 6.4.2 #3107
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
The commit of BUG-114430 has been cherry-picked and the datasource.js was backported. This way Grafana is first upgraded to 5.2.4 as it was done already on the 2.8 and 2.7.100 branches. Probably it is going to be easier to upgrade from 5.2.4 to 6.3.5 than go from 2.x in one step. Change-Id: I720f5fc5e6fbd82bf4f68e0631a11fc4967a27a0
Fix ./query_ctrl name in datasource.js. Change-Id: Ie6f57bbec7c2adb0747a79a566b14c294a2d11cb
Upon Ambari upgrade the grafana configuration template is updated based on the scak code. Change-Id: I11f32df3a9df56abde721608f7a61c2d703001e1
Cherry picked: BUG-114430 : Backport newer version of AMS Grafana from Ambari-2.8.0 to Ambari-2.6.2 Change-Id: Icc8dfd459abfafb1b24b895e4763ab5c5fbb048c
Change-Id: Ia00ac6a1c04db74346e2e822bdd6f2f7a926b81e
Change-Id: I010c3ba6ad448a1927771d76a6f780dc49de8592
Change-Id: If5500410026bc82d2ed9b3ff6d9476995302e5b6
Change-Id: I759d9e359a03297f97c7b30a6e8eea2c7615816c
Change-Id: Ib7b7cf1b070440095dad200476b401cf666eedef
Change-Id: Ic6e6ff587124335ac23efe5272c02dde585922d3
Change-Id: Ie081babf338ea36e6bfd6a04f9c522dc2183cff8
Change-Id: Ie85fbce0a8d02bde9103501b5d3b38984886a480
Change-Id: I666730edac88533495a4a53944ff9515ca001406
|
Refer to this link for build results (access rights to CI server needed): |
Change-Id: Iabe8a67aff996c1c903efed80e06388c9ed11346
|
recheck this please |
|
retest this please |
|
Refer to this link for build results (access rights to CI server needed): |
|
Merging based on Ihor's review. |
|
Refer to this link for build results (access rights to CI server needed): |
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.
What changes were proposed in this pull request?
The Grafana version of Ambari Metrics has been upgraded to 6.4.2 to eliminate security related issues with the old version.
How was this patch tested?
Manual testings were applied:
Some of the dashboards (Amabri, Kafka, HDFS) were manually tested.