-
Notifications
You must be signed in to change notification settings - Fork 5
Grafana #30
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
Open
Antom91
wants to merge
25
commits into
Onix-Systems:master
Choose a base branch
from
Antom91:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Grafana #30
Changes from 14 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
0853623
some changes
Antom91 93a33da
Include the grafana to project
Antom91 fea55ff
Still add Grafana
Antom91 7a4ffc1
Fix many bugs with Grafana
Antom91 79ae9ff
Add Some fixes
Antom91 5c52174
Add local configs for Grafana and add ProxyPass for Grafana
Antom91 0d05cf7
Make dashboards view with pass_proxy
Antom91 bfbdde3
Add condition for more one dashboard.json file
Antom91 0d40dea
fix of code, add some env
Antom91 84bc0e6
Some changes
Antom91 62184c1
uncomment Vagrantfile
Antom91 e9db1f9
changes
Antom91 f239894
try to fix travis
Antom91 8b669ba
changes
Antom91 d2662c8
Some changes for .env file and .travis.yml
Antom91 85cfca3
Create LDAP config file generation
Antom91 b5c3595
Edit Readme.md
Antom91 bf28eef
changed configs dir
Antom91 52d76ac
Change YAML file generation
Antom91 a7a7434
changed Grafana Entrypoint dir
Antom91 6751c64
Changes. Fix YAML Generation
Antom91 96b5a55
Clear not needed jinja2
Antom91 2618337
now not need to restart containers:)
Antom91 36848ed
Add ARG ro Dockerfile.Grafana
Antom91 84d3ba3
Disable LDAP cfg generation if LDAP auth is false
Antom91 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| FROM grafana/grafana:latest | ||
|
||
|
|
||
| USER root | ||
|
|
||
| ENV GF_INSTALL_PLUGINS=alexanderzobnin-zabbix-app | ||
|
|
||
| RUN chown -R grafana:grafana /etc/grafana | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
я понял, почему так сделано, но docker-compose.yml должен быть разработанный таким образом, чтобы .env не был обязательным. Он должен быть опциональным.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
в .env файле хранится пароль от графаны, который тянется в саму графану и в конфигуратор. Мне показалось что вариант хранения пароля в docker-compose.yml неправильный. Но только что я придумал ещё один вариант реализации... хм... Позже внесу его.