Allow more customizations in config.js

[kronn]

Background and Motivation

Grafana can be configure in many different ways, but the basic setup is always the same.

In order to use your module,
I want to pass in my own config-template
But still use the class to define the essential bits from the manifest.

Implementation

I added *_scheme-parameters for graphite, elasticsearch, and influxdb. I have Graphite and ElasticSearch running on a https-host, so I need that ability.

I also do not use InfluxDB, so I made the config-template overridable. This allows me to use our own template. In the template, I can still use the parameters defined in the class.

Side effects

Having the template overridable is essentially giving people enough rope to hang themselves. Then again, the target audience is admins and devops-teams, so we're all capable of handling this.

[bfraser]

Thanks for the pull request.

URL

I think the easiest and most effective way to give the user flexibility and control over the Graphite, Elasticsearch and InfluxDB URLs is to simply provide a url parameter. This should address the protocol/scheme which was the goal of your request, and provides coverage for users who may be using basic authentication etc.

Template

I understand your desire to have more control over the template. Perhaps, rather than parameterizing the template file to use, the existing template can be made better. My thinking was to introduce boolean parameters that control whether graphite, elasticsearch, and / or influxdb datasources are to be used, and have logic in the template that only includes them and makes use of their associated parameters if true.

Would these changes provide sufficient coverage for your use case, or do you still see a need for *_scheme parameters and parameterizing the template file?

Thanks!

[kronn]

The change you propose would be sufficient as well. I will try to come up with something later today and update this PR accordingly.

[kronn]

There, I fixed it ;-)

[kronn]

This should make Travis happy.

[kronn]

Ah, finally green. By now I must have touched almost all files of the module :-)

What do you think of the changes, @bfraser ?

[bfraser]

I'll try to have a look at this later today. Thanks for the diligence :-)

[bfraser]

Sorry, I haven't had a chance to get to this yet. Probably not until the weekend.

[kronn]

No problem. I'm using my own fork in the meantime. I just meant to be a good open-source citizen, not to stress you out.

If you spot more problems, just say it.

For now, I'm just happy that it works the way I want :-)

[analogue]

FYI, I little bit more flexible implementation for datasources - #4

[kronn]

That looks great, @analogue. I will update this PR to only cover the admin_password (because I use that). You solved the datasource-problem way more flexible than I did.

[bfraser]

Closing this out as the module now works with Grafana 2.x and there no longer is a config.js to manage.

[kronn]

👍