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

Make Loki HTTP API more compatible with Prometheus #1009

Merged
merged 1 commit into from
Sep 11, 2019
Merged

Make Loki HTTP API more compatible with Prometheus #1009

merged 1 commit into from
Sep 11, 2019

Conversation

cyriltovena
Copy link
Contributor

This PR makes it possible to add Loki as a Prometheus datasource to send metrics queries to Loki.

Example:

image

  • Tricks the LogQL engine to not returns error when querying "1+1"
  • Support for seconds timestamp by either checking the if there is a dot in the timestamp (which never happens for int64 nano) or by checking if the value is less or equal than 10 digit (which is not the case for nanoseconds)
  • Add a wrapper object in response result.
{
    "status" : "success",
    "data": {
      "resultType": "matrix" | "streams" | "vector",
      "result": <value>
    }
  }

This affects only the new API.

/cc @joe-elliott Sorry another change.

@cyriltovena cyriltovena changed the title Make Loki HTTP API more similar to Prometheus Make Loki HTTP API more compatible with Prometheus Sep 11, 2019
slim-bean
slim-bean approved these changes Sep 11, 2019
View reviewed changes
Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM!

@slim-bean slim-bean merged commit 364b5bc into grafana:master Sep 11, 2019
@cyriltovena
Copy link
Contributor Author

Thanks @rfratto

rfratto added a commit to rfratto/loki that referenced this pull request Sep 25, 2019
@rfratto
docs: incorporate api changes from grafana#1009
7720827
cyriltovena pushed a commit that referenced this pull request Sep 25, 2019
@rfratto @cyriltovena
Documentation Rewrite (#982)
65ba42a 
* docs: create structure of docs overhaul

This commit removes all old docs and lays out the table of contents and
framework for how the new documentation will be intended to be read.

* docs: add design docs back in

* docs: add community documentation

* docs: add LogQL docs

* docs: port existing operations documentation

* docs: add new placeholder file for promtail configuration docs

* docs: add TOC for operations/storage

* docs: add Loki API documentation

* docs: port troubleshooting document

* docs: add docker-driver documentation

* docs: link to configuration from main docker-driver document

* docs: update API for new paths

* docs: fix broken links in api.md and remove json marker from examples

* docs: incorporate api changes from #1009

* docs: port promtail documentation

* docs: add TOC to promtail configuration reference

* docs: fix promtail spelling errors

* docs: add loki configuration reference

* docs: add TOC to configuration

* docs: add loki configuration example

* docs: add Loki overview with brief explanation about each component

* docs: add comparisons document

* docs: add info on table manager and update storage/README.md

* docs: add getting started

* docs: incorporate config yaml changes from #755

* docs: fix typo in releases url for promtail

* docs: add installation instructions

* docs: add more configuration examples

* docs: add information on fluentd client

fluent-bit has been temporarily removed until the PR for it is merged.

* docs: PR review feedback

* docs: add architecture document

* docs: add missing information from old docs

* `localy` typo

Co-Authored-By: Ed Welch <ed@oqqer.com>

* docs: s/ran/run/g

* Typo

* Typo

* Tyop

* Typo

* docs: fixed typo

* docs: PR feedback

* docs: @cyriltovena PR feedback

* docs: add more details to promtail url config option

* docs: expand promtail's pipelines document with extra detail

* docs: remove reference to Stage interface in pipelines.md

* docs: fixed some spelling

* docs: clarify promtail configuration and scraping

* docs: attempt #2 at explaining promtail's usage of machine hostname

* docs: spelling fixes

* docs: add reference to promtail custom metrics and fix silly typo

* docs: cognizant -> aware

* docs: typo

* docs: typos

* docs: add which components expose which API endpoints in microservices mode

* docs: change ksonnet installation to tanka

* docs: address most @pracucci feedback

* docs: fix all spelling errors so reviewers don't have to keep finding them :)

* docs: incorporate changes to API endpoints made in #1022

* docs: add missing loki metrics

* docs: add missing promtail metrics

* docs: @pstribrany feedback

* docs: more @pracucci feedback

* docs: move metrics into a table

* docs: update push path references to /loki/api/v1/push

* docs: add detail to further explain limitations of monolithic mode

* docs: add alternative names to modes_of_operation diagram

* docs: add log ordering requirement

* docs: add procedure for updating docs with latest version

* docs: separate out stages documentation into one document per stage

* docs: list supported stores in storage documentation

* docs: add info on duplicate log lines in pipelines

* docs: add line_format as key feature to fluentd

* docs: hopefully final commit :)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slim-bean slim-bean slim-bean approved these changes

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
@cyriltovena @slim-bean