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

Updated stream json objects to be more parse friendly #1010

Merged
merged 14 commits into from
Sep 13, 2019
Merged

Updated stream json objects to be more parse friendly #1010

merged 14 commits into from
Sep 13, 2019

Conversation

joe-elliott
Copy link
Member

@joe-elliott joe-elliott commented Sep 11, 2019 •
edited
Loading

What this PR does / why we need it:

  • Updated the "streams" type returned from the query endpoints to reflect requests in More browser / parser friendly return format for timestamps  #273
  • Added testing for the custom Marshal methods that make this possible
  • Pathed /loki/v1/api/push to the push handler.
  • Cleaned up documentation to reflect changes and removed deprecated endpoints.
  • Set GOGC=20 on test to avoid OOM in circleci

Which issue(s) this PR fixes:
Fixes #273

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

@joe-elliott
Added custom marshaller for Entry
bc8f60c 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added comment and test
5fc2732 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Fixed spelling error
8012c29
@joe-elliott
Added a custom marshaller to map entries => values
7f27381
@joe-elliott
Added support for labels
2e7fc5a 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Changed test to only check to the microsecond level
bd0154d 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Extended Entry tests
f0beec1 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Swapped to nanosecs encoded as strings
9335abc
@joe-elliott
Cleaned up docs with new loki paths. Removed references to deprecated…
8326070 
… endpoints
@joe-elliott
Added support for /loki/api/v1/push
36d93e0 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Removed obsolete comment
bd46516 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated docs for new push endpoint
ce8e963 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Ran gofmt on test file
5754ead 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Set GOGC=20 on test to avoid out of memory issue in circle ci
1b2e5f3 
Signed-off-by: Joe Elliott <number101010@gmail.com>
cyriltovena
cyriltovena approved these changes Sep 13, 2019
View reviewed changes
Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM we might to change promtail push path.

@joe-elliott
Copy link
Member Author

LGTM we might to change promtail push path.

Doing a quick search fo the codebase for the old path: /api/prom/push suggests we should do this as a separate PR I think. It will be a nontrivial amount of changes/testing.

@cyriltovena cyriltovena merged commit 6185d54 into grafana:master Sep 13, 2019
slim-bean added a commit that referenced this pull request Sep 13, 2019
@slim-bean
Revert "Updated stream json objects to be more parse friendly (#1010)"
7d3faff 
This reverts commit 6185d54
slim-bean added a commit that referenced this pull request Sep 13, 2019
@slim-bean
Revert "Updated stream json objects to be more parse friendly (#1010)"
50456f9 
This reverts commit 6185d54
rfratto added a commit to rfratto/loki that referenced this pull request Sep 23, 2019
@rfratto
loki: add back new /loki/api/v1/push endpoint
5af8e44 
/loki/api/v1/push was added in grafana#1010 but was temporarily reverted. grafana#1022
reintroduced changes from grafana#1010 but inadvertently did not reintroduce
the new push endpoint.
@rfratto rfratto mentioned this pull request Sep 23, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cyriltovena cyriltovena cyriltovena approved these changes

@rfratto rfratto Awaiting requested review from rfratto

@slim-bean slim-bean Awaiting requested review from slim-bean

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

More browser / parser friendly return format for timestamps
2 participants
@joe-elliott @cyriltovena