From cccfe47bf051d90152763a9956d0e7bd9bf27695 Mon Sep 17 00:00:00 2001 From: hailthemelody Date: Mon, 20 Jun 2016 21:39:11 -0400 Subject: [PATCH 1/3] fix typos in GitHub Issue Template --- .github/ISSUE_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 9286c09966c..f4b0efdf14f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -9,9 +9,9 @@ Please include this information: - What OS are you running grafana on? - What did you do? - What was the expected result? -- What happenend instead? +- What happened instead? -**IMPORTANT** If it realates to metric data viz: +**IMPORTANT** If it relates to metric data viz: - An image or text representation of your metric query - The raw query and response for the network request (check this in chrome dev tools network tab, here you can see metric requests and other request, please include the request body and request response) From aa9e524e73f4b2178396b1c6395a8dfbadc70313 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 21 Jun 2016 11:46:08 +0200 Subject: [PATCH 2/3] tech(docker): add node exporter to prometheus --- docker/blocks/prometheus/fig | 6 ++++++ docker/blocks/prometheus/prometheus.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/blocks/prometheus/fig b/docker/blocks/prometheus/fig index ecfcf395d26..b4979918149 100644 --- a/docker/blocks/prometheus/fig +++ b/docker/blocks/prometheus/fig @@ -6,6 +6,12 @@ prometheus: volumes: - /var/docker/prometheus:/prometheus-data +node_exporter: + image: prom/node-exporter + net: bridge + ports: + - "9100:9100" + fake-prometheus-data: image: grafana/fake-data-gen net: bridge diff --git a/docker/blocks/prometheus/prometheus.yml b/docker/blocks/prometheus/prometheus.yml index 5c853622af3..a9616d4ea6c 100644 --- a/docker/blocks/prometheus/prometheus.yml +++ b/docker/blocks/prometheus/prometheus.yml @@ -23,4 +23,4 @@ scrape_configs: # scheme defaults to 'http'. target_groups: - - targets: ['localhost:9090', '172.17.0.1:9091'] + - targets: ['localhost:9090', '172.17.0.1:9091', '172.17.0.1:9100'] From ef9766eb963bcd028f564fc362d3247d61cca9e3 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 21 Jun 2016 16:29:17 +0200 Subject: [PATCH 3/3] docs(3.1): initial post about whats new in 3.1 --- conf/defaults.ini | 2 +- docs/sources/guides/whats-new-in-v3-1.md | 68 ++++++++++++++++++++++ docs/sources/installation/configuration.md | 13 +++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 docs/sources/guides/whats-new-in-v3-1.md diff --git a/conf/defaults.ini b/conf/defaults.ini index ea70f095ee1..c087fcf1ab1 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -251,7 +251,7 @@ templates_pattern = emails/*.html # Use space to separate multiple modes, e.g. "console file" mode = console, file -# Either "trace", "debug", "info", "warn", "error", "critical", default is "info" +# Either "debug", "info", "warn", "error", "critical", default is "info" level = info # For "console" mode only diff --git a/docs/sources/guides/whats-new-in-v3-1.md b/docs/sources/guides/whats-new-in-v3-1.md new file mode 100644 index 00000000000..9613cc1682c --- /dev/null +++ b/docs/sources/guides/whats-new-in-v3-1.md @@ -0,0 +1,68 @@ +--- +page_title: What's New in Grafana v3.1 +page_description: What's new in Grafana v3.1 +page_keywords: grafana, new, changes, features, documentation +--- + +# What's New in Grafana v3.1 + +## Dashboard Export & Import + +The export feature is now accessed from the share menu. + + + +Dashboards exported from Grafana 3.1 are now more portable and easier for others to import than before. +The export process extracts information data source types used by panels and adds these to a new `inputs` +section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to +select data source and optional metrix prefix options. + + + +The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard. +One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net). + +The next step in the import process: + + + +Here you can change the name of the dashboard and also pick what data sources you want the dashboard to use. The above screenshot +shows a CollectD dashboard for Graphite that requires a metric prefix be specified. + +## Discover Dashboards + +On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but +more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana, +then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL. + + + +## Constant template variables + +We added a new template variable named constant that makes it easier to share and export dashboard that have custom prefixes. + +## Dashboard Urls +Having current time range and template variable value always sync with the URL makes it possible to always copy your current +Grafana url to share with a colleague without having to use the Share modal. + +## Internal metrics + +Do you want metrics about viewing metrics? Ofc you do! In this release we added support for sending metrics about Grafana to graphite. +You can configure interval and server in the config file. + +## Logging + +Switched logging framework to log15 to enable key value per logging and filtering based on different log levels. +Its now possible to configure different log levels for different modules. + +### Breaking changes +- **Logging** format have been changed to improve log filtering. +- **Graphite PNG** Graphite PNG support dropped from Graph panel (use Grafana native PNG instead). +- **Migration** No longer possible to migrate dashboards from 1.x (Stored in ES or Influx 0.8). + +## CHANGELOG + +For a detailed list and link to github issues for everything included +in the 3.1 release please view the +[CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) +file. diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index de2055a2ae4..0c2bd7366e7 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -446,6 +446,19 @@ Grafana backend index those json dashboards which will make them appear in regul ### path The full path to a directory containing your json dashboards. +## [log] + +### mode +Either "console", "file", "syslog". Default is console and file +Use space to separate multiple modes, e.g. "console file" + +### level +Either "debug", "info", "warn", "error", "critical", default is "info" + +### filter +optional settings to set different levels for specific loggers. +Ex `filters = sqlstore:debug` + ## [metrics] ### enabled