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

[pull] master from grafana:master #654

Merged
merged 3 commits into from
Nov 6, 2020
Merged

[pull] master from grafana:master #654

merged 3 commits into from
Nov 6, 2020

Commits on Nov 6, 2020

  1. Fix typo (#2890)

    dfang authored Nov 6, 2020
    Configuration menu
    Copy the full SHA
    64d862f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8a3c9c8 View commit details
    Browse the repository at this point in the history
  3. LogQL: Improve template format (#2822)

    * Add error labels on failure and new functions for templates.
    
    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    
    * Updates docs.
    
    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    
    * Update docs/sources/logql/_index.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/_index.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Improve docs based off review feedback.
    
    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    
    * Review feedback.
    
    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    
    * Fixes panic out of boundary
    
    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    * Update docs/sources/logql/_index.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/functions.md
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Update docs/sources/logql/_index.md
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    * Apply suggestions from code review
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    
    * Apply suggestions from code review
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    * Apply suggestions from code review
    
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    
    Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
    Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
    3 people authored Nov 6, 2020
    Configuration menu
    Copy the full SHA
    e2aee2a View commit details
    Browse the repository at this point in the history