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.

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

Docs: Adding how to use plugin version, through docker env variable #19924

Merged
merged 5 commits into from
Nov 7, 2019

Conversation

joachimlindborg
Copy link
Contributor

It was unclear if one can specify the plugin version to the environment variable when installing plugins when instatiating the docker componen. It is possible and works fine.
Added some text to the documentation

Tested towards grafana 5.3.4

This PR clarifies documentation / love your work:

*fixes documentation:

Fixes #

Special notes for your reviewer:

It was unclear if one can specify the plugin version to the environment variable. It is possible and works fine. Added it to the plugin information.
@CLAassistant
Copy link

CLAassistant commented Oct 19, 2019

CLA assistant check
All committers have signed the CLA.

docs/sources/installation/docker.md Outdated Show resolved Hide resolved
@@ -87,7 +87,7 @@ docker run \

## Building a custom Grafana image with pre-installed plugins

In the [grafana-docker](https://github.com/grafana/grafana/tree/master/packaging/docker) there is a folder called `custom/` which includes a `Dockerfile` that can be used to build a custom Grafana image. It accepts `GRAFANA_VERSION` and `GF_INSTALL_PLUGINS` as build arguments.
In the [grafana-docker](https://github.com/grafana/grafana/tree/master/packaging/docker) there is a folder called `custom/` which includes a `Dockerfile` that can be used to build a custom Grafana image. It accepts `GRAFANA_VERSION` and `GF_INSTALL_PLUGINS` as build arguments. If you need to specify a specific plugin version you can add version to plugin evnironment variable `--build-arg "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource"`
Copy link
Contributor

Choose a reason for hiding this comment

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

same typo here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hope I fixed it right now

Copy link
Contributor

Choose a reason for hiding this comment

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

The typo is not fixed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, I would propose to move the new sentence under the example block so the reader will have a better understanding of the whole context since first there will be the simpler example and under there will be the more specific one.

Copy link
Contributor

Choose a reason for hiding this comment

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

There is also a missing . at the end of the sentence.

@marefr marefr added area/backend type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project labels Oct 30, 2019
@@ -74,7 +74,7 @@ For a list of available tags, check out [grafana/grafana](https://hub.docker.com

## Installing Plugins for Grafana

Pass the plugins you want installed to docker with the `GF_INSTALL_PLUGINS` environment variable as a comma separated list. This will pass each plugin name to `grafana-cli plugins install ${plugin}` and install them when Grafana starts.
Pass the plugins you want installed to docker with the `GF_INSTALL_PLUGINS` environment variable as a comma separated list. This will pass each plugin name to `grafana-cli plugins install ${plugin}` and install them when Grafana starts. If you need to specify a specific plugin version you can add optional version to plugin environment variable otherwise latest will be assumed `--build-arg "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource 1.3.5"`
Copy link
Contributor

Choose a reason for hiding this comment

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

There is a missing . at the end of the sentence.
Also, instead of --build-arg should be -e since the example below is a docker run instead of a docker build command.
Finally, I would propose to move the new sentence under the example docker run so the reader will have a better understanding of the whole context.

Copy link
Contributor

@papagian papagian left a comment

Choose a reason for hiding this comment

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

Thank you a lot for contributing this.
Please check my comments for some some modifications I have asked.

Moved the information to make it more readable, fixed typos and added missing punctuation.
@@ -85,6 +85,8 @@ docker run \
grafana/grafana
```

> If you need to specify the version of a plugin, you can add it to the command. Otherwise latest will be assumed. `-e "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource 1.3.5"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Great, I liked the idea that you have used notes!
I also preferred it as it was before the last modification, so I would change it to:

If you need to specify the version of a plugin, you can add it to the GF_INSTALL_PLUGINS environment variable. Otherwise, the latest will be assumed.
For example: -e "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource 1.3.5"

@@ -103,6 +105,8 @@ docker run \
grafana:latest-with-plugins
```

> If you need to specify the version of a plugin, you can add it to the build argument. Otherwise latest will be assumed. `--build-arg "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource 1.3.5"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, I would change it to:

If you need to specify the version of a plugin, you can add it to the GF_INSTALL_PLUGINS build argument. Otherwise, the latest will be assumed.
For example: --build-arg "GF_INSTALL_PLUGINS=grafana-clock-panel 1.0.1,grafana-simple-json-datasource 1.3.5"

@papagian papagian self-requested a review October 31, 2019 07:45
Copy link
Contributor

@papagian papagian left a comment

Choose a reason for hiding this comment

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

Thank you for making the requested modifications.
I would recommend some minor changes before finally merging it.

@papagian papagian added the pr/external This PR is from external contributor label Oct 31, 2019
More feedback, added example text. Did not manage to get newline for the example.
@papagian papagian self-requested a review November 4, 2019 07:57
Copy link
Contributor

@papagian papagian left a comment

Choose a reason for hiding this comment

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

Great, thanks!
I have asked for a minor modification before merging it.

Copy link
Contributor

@papagian papagian left a comment

Choose a reason for hiding this comment

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

Great, thank you for your contribution.

@papagian papagian changed the title Adding how to use plugin version, through docker env variable Docs: Adding how to use plugin version, through docker env variable Nov 7, 2019
@papagian papagian merged commit a883350 into grafana:master Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/backend pr/changes-needed pr/external This PR is from external contributor type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants