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

rename Tags to Labels in SeriesData (simple) #16284

Merged
merged 2 commits into from Mar 29, 2019
Merged

rename Tags to Labels in SeriesData (simple) #16284

merged 2 commits into from Mar 29, 2019

Conversation

ryantxu
Copy link
Member

@ryantxu ryantxu commented Mar 29, 2019

I'm looking at loki and SeriesData... about to post a proposal :)

We added a Tags interface to SeriesData, but I think we should rename it to Labels so it feels more natural for the prometheus/loki people and I don't think anyone really cares that it is called Tags

@ryantxu ryantxu mentioned this pull request Mar 29, 2019
Merged
@torkelo
Copy link
Member

torkelo commented Mar 29, 2019 •
edited

Think this could a good change, the only reason I went with tags here is that backend model calls it Tags, https://github.com/grafana/grafana/blob/master/pkg/tsdb/models.go#L39

Graphite & InfluxDB as well. But the backend model should be able to change that without breaking changes as we only have internal data sources that use it.

@ryantxu
Copy link
Member Author

ryantxu commented Mar 29, 2019

I just updated this to:

  1. add tags to the TimeSeries model
  2. copy TimeSeries tags to SeriesData labels when converting

There is obviously no right answer on tags vs labels -- we just got to pick one :)

Eventually I hope the backend has a SeriesData model, but since it does not match TimeSeries anyway, I don't think it matters

@torkelo torkelo merged commit d0d5b38 into grafana:master Mar 29, 2019
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into table-datasource
896f9b4 
* grafana/master:
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into panel-in-view-from…
10d819f 
…-scroll-again

* grafana/master:
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into clone-reference-panel
cb55609 
* grafana/master:
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into dynamic-units
5e5d374 
* grafana/master: (102 commits)
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
  Feature: added actionable message in Explore when no datasource configured (grafana#16252)
  Feature: Case insensitive Loki search (grafana#15948)
  Feat: Singlestat panel react progress & refactorings (grafana#16039)
  Chore: Implement gosec (grafana#16261)
  Fix: Updated snapshot unit test that was failing
  Refactor: Theme & Removed the last rems (grafana#16245)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into stats-filter
783cc20 
* grafana/master:
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into expose-get-backend…
8e17d98 
…-srv

* grafana/master:
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into jwt
c80f2b9 
* grafana/master:
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Mar 29, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into timepicker-tooltip
aaf0a18 
* grafana/master: (608 commits)
  Fix: Bring back styles on Switch components when checked
  Update CHANGELOG.md
  Chore: breaks build if certain FrontEnd limits are exceeded (grafana#16301)
  Fix: Graphite query ast to string fix (grafana#16297)
  Fix: Template query editor this bind exception fix (grafana#16299)
  Fix: Alerting Notification channel http api fixes (grafana#16288)
  Refactor: Move LogLevel and Labels utils to @grafana/ui (grafana#16285)
  Refactor: Rename Tags to Labels in SeriesData (simple) (grafana#16284)
  Elasticsearch: Fix view percentiles metric in table without date histogram (grafana#15686)
  Configuration: Improve session_lifetime comments (grafana#16238)
  Alerting: Makes timeouts and retries configurable (grafana#16259)
  Fix: Correct SnapshotData typing (grafana#16279)
  Feat: Angular panels & SeriesData to Table/TimeSeries (grafana#16266)
  Fix: React Graph & Show message on no data (grafana#16278)
  Feature: added actionable message in Explore when no datasource configured (grafana#16252)
  Feature: Case insensitive Loki search (grafana#15948)
  Feat: Singlestat panel react progress & refactorings (grafana#16039)
  Chore: Implement gosec (grafana#16261)
  Fix: Updated snapshot unit test that was failing
  Refactor: Theme & Removed the last rems (grafana#16245)
  ...
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.

None yet
2 participants
@ryantxu @torkelo