Extend Functionality of Grafana Package - #2098
Conversation
…into version-3.x
|
I thought an upstream merge might work but it didn't. May I have view perms on TC to see why the checks are failing? |
|
@cbakersdl All the TeamCity tests have passed. I'll leave it to @ryadav88 and @mattj-io to review and merge. |
|
@ryadav88 - I don't know enough about packages to review this code, although happy to test. Can you review please ? |
|
Aww bummer. Looks like a test is failing again. Anything I need to do? |
| "assets": { | ||
| "uris": { | ||
| "jre-tar-gz": "https://downloads.mesosphere.com/java/server-jre-8u162-linux-x64.tar.gz", | ||
| "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.11.0.tar.gz", |
There was a problem hiding this comment.
Please bump this to libmesos-bundle-1.12.0.tar.gz
| { | ||
| "packagingVersion": "4.0", | ||
| "upgradesFrom": [ | ||
| "*" |
There was a problem hiding this comment.
Shouldn't this be the previous package version?
| "*" | ||
| ], | ||
| "downgradesTo": [ | ||
| "*" |
There was a problem hiding this comment.
Shouldn't this be the previous package version?
There was a problem hiding this comment.
I just copied this from 6/package.json. Should I change it to 3.0?
| "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", | ||
| "GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}", | ||
| {{#service.service_account_secret}} | ||
| "DCOS_SERVICE_ACCOUNT_CREDENTIAL": { "secret": "serviceCredential" }, |
There was a problem hiding this comment.
Please change this so that we inject the Service Account as a File-Based Secret so that we don't accidentally leak its RSA Private Key:
"DCOS_SERVICE_ACCOUNT_CREDENTIAL": "secrets/service-account.json",
d2iq-mergebot
added
the
awaiting-testing-approval
…into version-3.x
|
Once @ryadav88 and/or @realmbgl approve this you'll have my approval @cbakersdl Thank you for your patience. |
ryadav88
left a comment
ryadav88
left a comment
There was a problem hiding this comment.
LGTM. Thanks for the contribution @cbakersdl.
dcos/examples#384 to be merged along with this package update.
Review dismissed as PR branch got new commits. Please re-review new commits.
6 participants
The Grafana package was missing the ability to configure the service at installation/start time. Nor was there any way to change the configuration afterward. It did not contain any volume option so any dashboards/datasources created would not persist across restarts.
My objective was to enable full configuration and provisioning of the service at installation time in addition to persistent volume option. I have tested it to work with the DC/OS Prometheus package and DC/OS version 1.11.
I have also added a full example: https://github.com/cbakersdl/examples/tree/master/grafana which will depend on this merge.
One thing I am not sure of is the maintenance of my svc.yml changes going forward. My org is hosting it here for now: https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/7/svc.yml but I'm curious to know if Mesosphere will take over hosting it or how that works. It would be really cool to be able to commit these files to the repo as well.