Skip to content

Commit 302ad5f

Browse files
torkelotorkelo
committed
Merge branch 'master' of github.com:grafana/grafana
2 parents 257e6c4 + ef9766e commit 302ad5f

File tree

6 files changed

+91
-4
lines changed

6 files changed

+91
-4
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Please include this information:
99
- What OS are you running grafana on?
1010
- What did you do?
1111
- What was the expected result?
12-
- What happenend instead?
12+
- What happened instead?
1313

14-
**IMPORTANT** If it realates to metric data viz:
14+
**IMPORTANT** If it relates to metric data viz:
1515
- An image or text representation of your metric query
1616
- 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)
1717

‎conf/defaults.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ templates_pattern = emails/*.html
251251
# Use space to separate multiple modes, e.g. "console file"
252252
mode = console, file
253253

254-
# Either "trace", "debug", "info", "warn", "error", "critical", default is "info"
254+
# Either "debug", "info", "warn", "error", "critical", default is "info"
255255
level = info
256256

257257
# For "console" mode only

‎docker/blocks/prometheus/fig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ prometheus:
66
volumes:
77
- /var/docker/prometheus:/prometheus-data
88

9+
node_exporter:
10+
image: prom/node-exporter
11+
net: bridge
12+
ports:
13+
- "9100:9100"
14+
915
fake-prometheus-data:
1016
image: grafana/fake-data-gen
1117
net: bridge

‎docker/blocks/prometheus/prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ scrape_configs:
2323
# scheme defaults to 'http'.
2424

2525
target_groups:
26-
- targets: ['localhost:9090', '172.17.0.1:9091']
26+
- targets: ['localhost:9090', '172.17.0.1:9091', '172.17.0.1:9100']

‎docs/sources/guides/whats-new-in-v3-1.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
---
2+
page_title: What's New in Grafana v3.1
3+
page_description: What's new in Grafana v3.1
4+
page_keywords: grafana, new, changes, features, documentation
5+
---
6+
7+
# What's New in Grafana v3.1
8+
9+
## Dashboard Export & Import
10+
11+
The export feature is now accessed from the share menu.
12+
13+
<img src="/img/v31/export_menu.png">
14+
15+
Dashboards exported from Grafana 3.1 are now more portable and easier for others to import than before.
16+
The export process extracts information data source types used by panels and adds these to a new `inputs`
17+
section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to
18+
select data source and optional metrix prefix options.
19+
20+
<img src="/img/v31/import_step1.png">
21+
22+
The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard.
23+
One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net).
24+
25+
The next step in the import process:
26+
27+
<img src="/img/v31/import_step2.png">
28+
29+
Here you can change the name of the dashboard and also pick what data sources you want the dashboard to use. The above screenshot
30+
shows a CollectD dashboard for Graphite that requires a metric prefix be specified.
31+
32+
## Discover Dashboards
33+
34+
On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but
35+
more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana,
36+
then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL.
37+
38+
<img src="/img/v31/gnet_dashboards_list.png">
39+
40+
## Constant template variables
41+
42+
We added a new template variable named constant that makes it easier to share and export dashboard that have custom prefixes.
43+
44+
## Dashboard Urls
45+
Having current time range and template variable value always sync with the URL makes it possible to always copy your current
46+
Grafana url to share with a colleague without having to use the Share modal.
47+
48+
## Internal metrics
49+
50+
Do you want metrics about viewing metrics? Ofc you do! In this release we added support for sending metrics about Grafana to graphite.
51+
You can configure interval and server in the config file.
52+
53+
## Logging
54+
55+
Switched logging framework to log15 to enable key value per logging and filtering based on different log levels.
56+
Its now possible to configure different log levels for different modules.
57+
58+
### Breaking changes
59+
- **Logging** format have been changed to improve log filtering.
60+
- **Graphite PNG** Graphite PNG support dropped from Graph panel (use Grafana native PNG instead).
61+
- **Migration** No longer possible to migrate dashboards from 1.x (Stored in ES or Influx 0.8).
62+
63+
## CHANGELOG
64+
65+
For a detailed list and link to github issues for everything included
66+
in the 3.1 release please view the
67+
[CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
68+
file.

‎docs/sources/installation/configuration.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,19 @@ Grafana backend index those json dashboards which will make them appear in regul
446446
### path
447447
The full path to a directory containing your json dashboards.
448448

449+
## [log]
450+
451+
### mode
452+
Either "console", "file", "syslog". Default is console and file
453+
Use space to separate multiple modes, e.g. "console file"
454+
455+
### level
456+
Either "debug", "info", "warn", "error", "critical", default is "info"
457+
458+
### filter
459+
optional settings to set different levels for specific loggers.
460+
Ex `filters = sqlstore:debug`
461+
449462
## [metrics]
450463

451464
### enabled

0 commit comments

Comments
 (0)