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

Config: Fix connectionstring for remote_cache in defaults.ini #17675

Merged
merged 3 commits into from Jun 20, 2019

Conversation

@kylebrandt
Copy link
Contributor

kylebrandt commented Jun 20, 2019

fixes #17643

@kylebrandt kylebrandt requested a review from torkelo Jun 20, 2019
@kylebrandt kylebrandt marked this pull request as ready for review Jun 20, 2019
@kylebrandt kylebrandt added this to the 6.2.5 milestone Jun 20, 2019
@kylebrandt kylebrandt requested a review from marefr Jun 20, 2019
pkg/setting/setting_test.go Outdated Show resolved Hide resolved
@marefr
marefr approved these changes Jun 20, 2019
Copy link
Member

marefr left a comment

Awesome stuff @kylebrandt 👍 Extremely valuable to have test for this! Just fix your comment and you can merge this.

@kylebrandt kylebrandt changed the title config: fix connstr for remote_cache in defaults.ini Config: fix connstr for remote_cache in defaults.ini which broke the related environment variable Jun 20, 2019
@kylebrandt kylebrandt merged commit 49f0f0e into master Jun 20, 2019
2 checks passed
2 checks passed
build-branches-and-prs Workflow: build-branches-and-prs
Details
license/cla Contributor License Agreement is signed.
Details
@kylebrandt kylebrandt deleted the conf_connstr_default branch Jun 20, 2019
@marefr marefr changed the title Config: fix connstr for remote_cache in defaults.ini which broke the related environment variable Config: Fix connectionstring for remote_cache in defaults.ini Jun 24, 2019
markelog added a commit that referenced this pull request Jun 24, 2019
* master:
  TimePicker: New time picker dropdown & custom range UI (#16811)
  RemoteCache: redis connection string parsing test (#17702)
  Fix link in pkg/README (#17714)
  Dashboard: Use Explore's Prometheus editor in dashboard panel edit (#15364)
  Settings: Fix typo in defaults.ini (#17707)
  Project: Adds a security policy (#17698)
  Project: Adds support resource docs (#17699)
  Document issue triage process (#17669)
  noImplicitAny: slate (#17681)
  config: fix connstr for remote_cache (#17675)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 24, 2019
…-mapping-to-field

* grafana/master:
  Elasticsearch: Visualize logs in Explore (grafana#17605)
  Grafana-CLI: Wrapper for `grafana-cli` within RPM/DEB packages and config/homepath are now global flags (grafana#17695)
  Add guidelines for SQL date comparisons (grafana#17732)
  Docs: clarified usage of go get and go mod (grafana#17637)
  Project: Issue triage doc improvement (grafana#17709)
  Improvement: Grafana release process minor improvements (grafana#17661)
  TimePicker: New time picker dropdown & custom range UI (grafana#16811)
  RemoteCache: redis connection string parsing test (grafana#17702)
  Fix link in pkg/README (grafana#17714)
  Dashboard: Use Explore's Prometheus editor in dashboard panel edit (grafana#15364)
  Settings: Fix typo in defaults.ini (grafana#17707)
  Project: Adds a security policy (grafana#17698)
  Project: Adds support resource docs (grafana#17699)
  Document issue triage process (grafana#17669)
  noImplicitAny: slate (grafana#17681)
  config: fix connstr for remote_cache (grafana#17675)
  Explore: Improves performance of Logs element by limiting re-rendering (grafana#17685)
  Docs: Flag serve_from_sub_path as available in 6.3 (grafana#17674)
  @grafana/runtime: expose config and loadPluginCss (grafana#17655)
  noImplicitAny: Fix basic errors (grafana#17668)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 25, 2019
* grafana/master:
  Elasticsearch: Visualize logs in Explore (grafana#17605)
  Grafana-CLI: Wrapper for `grafana-cli` within RPM/DEB packages and config/homepath are now global flags (grafana#17695)
  Add guidelines for SQL date comparisons (grafana#17732)
  Docs: clarified usage of go get and go mod (grafana#17637)
  Project: Issue triage doc improvement (grafana#17709)
  Improvement: Grafana release process minor improvements (grafana#17661)
  TimePicker: New time picker dropdown & custom range UI (grafana#16811)
  RemoteCache: redis connection string parsing test (grafana#17702)
  Fix link in pkg/README (grafana#17714)
  Dashboard: Use Explore's Prometheus editor in dashboard panel edit (grafana#15364)
  Settings: Fix typo in defaults.ini (grafana#17707)
  Project: Adds a security policy (grafana#17698)
  Project: Adds support resource docs (grafana#17699)
  Document issue triage process (grafana#17669)
  noImplicitAny: slate (grafana#17681)
  config: fix connstr for remote_cache (grafana#17675)
  Explore: Improves performance of Logs element by limiting re-rendering (grafana#17685)
  Docs: Flag serve_from_sub_path as available in 6.3 (grafana#17674)
kylebrandt added a commit that referenced this pull request Jun 25, 2019
fixes #17643 and adds test to check for commented out lines (but will only catch `;`, not `#`).

(cherry picked from commit 49f0f0e)
kylebrandt added a commit that referenced this pull request Jun 25, 2019
fixes #17643 and adds test to check for commented out lines (but will only catch `;`, not `#`).

(cherry picked from commit 49f0f0e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.