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.

Sign up for GitHub

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

Jump to bottom

Prometheus: Minor style fix #17773

Merged
merged 2 commits into from
Jun 26, 2019
Merged

Prometheus: Minor style fix #17773

merged 2 commits into from
Jun 26, 2019

Conversation

torkelo
Copy link
Member

@torkelo torkelo commented Jun 26, 2019 •
edited
Loading

  • Changed so that prometheus query editor is not nested inside an input class

@torkelo torkelo merged commit 40e5c4f into master Jun 26, 2019
@torkelo torkelo deleted the prometheus-query-editor-style-fix branch June 26, 2019 07:56
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 26, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into anno-regions
421844b 
* grafana/master:
  Usage Stats: Update known datasource plugins (grafana#17787)
  Docs: Adds section on Querying Logs for Elasticsearch (grafana#17730)
  Docs: Adds section on Querying Logs for InfluxDB (grafana#17726)
  Devenv: makes the grafana users default for saml. (grafana#17782)
  Explore: Displays only one Time column as configured in TimeZone settings (grafana#17775)
  Markdown: Replace rendering library (grafana#17686)
  ApiKeys: Fix check for UTC timezone (grafana#17776)
  Prometheus: Minor style fix (grafana#17773)
  Docs: fixed notifications table
  Auth: Allow expiration of API keys (grafana#17678)
  17278 prometheus step align utc (grafana#17477)
  Docs: Update release guide  (grafana#17759)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 26, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into jwt
6cb6817 
* grafana/master:
  Usage Stats: Update known datasource plugins (grafana#17787)
  Docs: Adds section on Querying Logs for Elasticsearch (grafana#17730)
  Docs: Adds section on Querying Logs for InfluxDB (grafana#17726)
  Devenv: makes the grafana users default for saml. (grafana#17782)
  Explore: Displays only one Time column as configured in TimeZone settings (grafana#17775)
  Markdown: Replace rendering library (grafana#17686)
  ApiKeys: Fix check for UTC timezone (grafana#17776)
  Prometheus: Minor style fix (grafana#17773)
  Docs: fixed notifications table
  Auth: Allow expiration of API keys (grafana#17678)
  17278 prometheus step align utc (grafana#17477)
  Docs: Update release guide  (grafana#17759)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 27, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into anno-panel
c8ab779 
* grafana/master:
  noImplicitAny: Lower count to about 3450 (grafana#17799)
  Graphite: Fixes issue with seriesByTag & function with variable param (grafana#17795)
  noImplicitAny: Reduce errors to 3800-ish (grafana#17781)
  Graphite: remove feature that moves alias function last (grafana#17791)
  Explore: Adds URL support for select mode (grafana#17755)
  TestData: add option to increase the number of test streams (grafana#17789)
  Usage Stats: Update known datasource plugins (grafana#17787)
  Docs: Adds section on Querying Logs for Elasticsearch (grafana#17730)
  Docs: Adds section on Querying Logs for InfluxDB (grafana#17726)
  Devenv: makes the grafana users default for saml. (grafana#17782)
  Explore: Displays only one Time column as configured in TimeZone settings (grafana#17775)
  Markdown: Replace rendering library (grafana#17686)
  ApiKeys: Fix check for UTC timezone (grafana#17776)
  Prometheus: Minor style fix (grafana#17773)
  Docs: fixed notifications table
  Auth: Allow expiration of API keys (grafana#17678)
  17278 prometheus step align utc (grafana#17477)
  Docs: Update release guide  (grafana#17759)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jun 27, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into move-threshold-and…
6b08472 
…-mapping-to-field

* grafana/master: (35 commits)
  noImplicitAny: Lower count to about 3450 (grafana#17799)
  Graphite: Fixes issue with seriesByTag & function with variable param (grafana#17795)
  noImplicitAny: Reduce errors to 3800-ish (grafana#17781)
  Graphite: remove feature that moves alias function last (grafana#17791)
  Explore: Adds URL support for select mode (grafana#17755)
  TestData: add option to increase the number of test streams (grafana#17789)
  Usage Stats: Update known datasource plugins (grafana#17787)
  Docs: Adds section on Querying Logs for Elasticsearch (grafana#17730)
  Docs: Adds section on Querying Logs for InfluxDB (grafana#17726)
  Devenv: makes the grafana users default for saml. (grafana#17782)
  Explore: Displays only one Time column as configured in TimeZone settings (grafana#17775)
  Markdown: Replace rendering library (grafana#17686)
  ApiKeys: Fix check for UTC timezone (grafana#17776)
  Prometheus: Minor style fix (grafana#17773)
  Docs: fixed notifications table
  Auth: Allow expiration of API keys (grafana#17678)
  17278 prometheus step align utc (grafana#17477)
  Docs: Update release guide  (grafana#17759)
  release: update latest.json to v6.2.5 (grafana#17767)
  release: 6.2.5 changelog (grafana#17766)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@torkelo