From 50d146e82c85ec84907fa3c160df40e589ef700f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 29 Sep 2016 14:53:50 +0200 Subject: [PATCH] fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027 --- docs/sources/datasources/influxdb.md | 6 +----- pkg/services/alerting/engine.go | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/sources/datasources/influxdb.md b/docs/sources/datasources/influxdb.md index da8ca08f549..c66d1ef5b69 100644 --- a/docs/sources/datasources/influxdb.md +++ b/docs/sources/datasources/influxdb.md @@ -6,11 +6,7 @@ page_keywords: grafana, influxdb, metrics, query, documentation # InfluxDB -There are currently two separate datasources for InfluxDB in Grafana: InfluxDB 0.8.x and InfluxDB 0.9.x. -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. +Grafana ships with very a feature data source plugin for InfluxDB. Supporting a feature rich query editor, annotation and templating queries. ## Adding the data source ![](/img/v2/add_Influx.jpg) diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go index 10b8af64119..16a2835e642 100644 --- a/pkg/services/alerting/engine.go +++ b/pkg/services/alerting/engine.go @@ -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.resultHandler.Handle(result) }