IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-09-29 14:53:50 +02:00
parent 5a1a80bcdd
commit 50d146e82c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/sources/datasources/influxdb.md
View File

@ -6,11 +6,7 @@ page_keywords: grafana, influxdb, metrics, query, documentation
# InfluxDB # InfluxDB
There are currently two separate datasources for InfluxDB in Grafana: InfluxDB 0.8.x and InfluxDB 0.9.x. Grafana ships with very a feature data source plugin for InfluxDB. Supporting a feature rich query editor, annotation and templating queries.
The API and capabilities of InfluxDB 0.9.x are completely different from InfluxDB 0.8.x which is why Grafana handles
them as different data sources.
InfluxDB 0.9 is rapidly evolving and we continue to track its API. InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users.
## Adding the data source ## Adding the data source
![](/img/v2/add_Influx.jpg) ![](/img/v2/add_Influx.jpg)

1
pkg/services/alerting/engine.go
View File

@ -144,6 +144,7 @@ func (e *Engine) handleResponse(result *EvalContext) {
} }
}() }()
e.log.Info("rule", "nil", result.Rule == nil)
e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing) e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing)
e.resultHandler.Handle(result) e.resultHandler.Handle(result)
} }