From 984b6cb0fb7a4e00f3154beb8effe4b2843c90a6 Mon Sep 17 00:00:00 2001
From: Martin <martin@seener.de>
Date: Fri, 27 May 2016 17:12:36 +0200
Subject: [PATCH] =?UTF-8?q?Made=20the=20apache=20input=E2=80=99s=20urls=20?=
 =?UTF-8?q?parameter=20optional=20by=20using=20a=20reasonable=20default=20?=
 =?UTF-8?q?for=20most=20users=20(#1288)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/telegraf.conf               | 1 +
 plugins/inputs/apache/README.md | 2 +-
 plugins/inputs/apache/apache.go | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 05f47e861..4081cf484 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -454,6 +454,7 @@
 # # Read Apache status information (mod_status)
 # [[inputs.apache]]
 #   ## An array of Apache status URI to gather stats.
+#   ## Default is "http://localhost/server-status?auto".
 #   urls = ["http://localhost/server-status?auto"]
 
 
diff --git a/plugins/inputs/apache/README.md b/plugins/inputs/apache/README.md
index 0f2f0deed..60a4783d2 100644
--- a/plugins/inputs/apache/README.md
+++ b/plugins/inputs/apache/README.md
@@ -1,7 +1,7 @@
 # Telegraf plugin: Apache
 
 #### Plugin arguments:
-- **urls** []string: List of apache-status URLs to collect from.
+- **urls** []string: List of apache-status URLs to collect from. Default is "http://localhost/server-status?auto".
 
 #### Description
 
diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
index eba5a1188..dc5dddb9d 100644
--- a/plugins/inputs/apache/apache.go
+++ b/plugins/inputs/apache/apache.go
@@ -21,6 +21,7 @@ type Apache struct {
 
 var sampleConfig = `
   ## An array of Apache status URI to gather stats.
+  ## Default is "http://localhost/server-status?auto".
   urls = ["http://localhost/server-status?auto"]
 `
 
@@ -33,6 +34,10 @@ func (n *Apache) Description() string {
 }
 
 func (n *Apache) Gather(acc telegraf.Accumulator) error {
+	if len(n.Urls) == 0 {
+		n.Urls = []string{"http://localhost/server-status?auto"}
+	}
+
 	var wg sync.WaitGroup
 	var outerr error