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

Few fixes to the grafana module and states #48671

Merged
merged 4 commits into from Jul 20, 2018

Conversation

Projects
None yet
2 participants
@bbinet
Contributor

bbinet commented Jul 19, 2018

What does this PR do?

fixes few bugs in the grafana module and states

What issues does this PR fix or reference?

None

Tests written?

No

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

bbinet added some commits Jul 19, 2018

Ignore readOnly option when diffing
readOnly value is true only for datasource stored in config (not created
dynamically through the grafana API)
See: grafana/grafana#9659
influxdb: fix conflicts in function arg names with client_args
Rename client_args names so that it won't conflict anymore with some
named parameters of influx module function.

For example, the "create_user" function had a "password" argument that
was conflicting with the "password" named argument from client_args.
@bbinet

This comment has been minimized.

Contributor

bbinet commented Jul 20, 2018

I've also added support for dry run (test=True) of grafana states in commit 3c5083f.
This fixes existing issue #43675

@rallytime rallytime merged commit 9d7eabd into saltstack:2018.3 Jul 20, 2018

7 of 8 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@bbinet bbinet deleted the bbinet:grafana-fixes branch Jul 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment