From f75e2d44cef507248d775122e4f9c0c443ac059b Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Fri, 22 May 2015 16:28:13 -0700
Subject: [PATCH] Regenerate sample config. Fixes #1

---
 tivan.toml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tivan.toml b/tivan.toml
index 7cf8042fe..a5ee89f6c 100644
--- a/tivan.toml
+++ b/tivan.toml
@@ -1,26 +1,39 @@
 # Tivan configuration
 
+# If this file is missing an [agent] section, you must first generate a
+# valid config with 'tivan -sample-config > tivan.toml'
+
 # Tivan is entirely plugin driven. All metrics are gathered from the
 # declared plugins.
 
 # Even if a plugin has no configuration, it must be declared in here
 # to be active. Declaring a plugin means just specifying the name
-# as a section with no variables.
+# as a section with no variables. To deactivate a plugin, comment
+# out the name and any variables.
 
 # Use 'tivan -config tivan.toml -test' to see what metrics a config
 # file would generate.
 
-# One rule that plugins conform is wherever a connection string
+# One rule that plugins conform to is wherever a connection string
 # can be passed, the values '' and 'localhost' are treated specially.
 # They indicate to the plugin to use their own builtin configuration to
 # connect to the local system.
 
+# NOTE: The configuration has a few required parameters. They are marked
+# with 'required'. Be sure to edit those to make this configuration work.
+
 # Configuration for influxdb server to send metrics to
-# [influxdb]
-# url = "http://10.20.2.4"
+[influxdb]
+# The full HTTP endpoint URL for your InfluxDB instance
+url = "http://10.20.2.4:8086" # required.
+
+# The target database for metrics. This database must already exist
+database = "tivan" # required.
+
 # username = "tivan"
 # password = "metricsmetricsmetricsmetrics"
-# database = "tivan"
+
+# Set the user agent for the POSTs (can be useful for log differentiation)
 # user_agent = "tivan"
 # tags = { "dc": "us-east-1" }
 
@@ -29,6 +42,12 @@
 # [influxdb.tags]
 # dc = "us-east-1"
 
+# Configuration for tivan itself
+# [agent]
+# interval = "10s"
+# debug = false
+# hostname = "prod3241"
+
 # PLUGINS
 
 # Read metrics about cpu usage
@@ -56,6 +75,7 @@
 
 # specify servers via a url matching:
 #  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
+#  e.g. root:root@http://10.0.0.18/?tls=false
 #
 # If no servers are specified, then localhost is used as the host.
 servers = ["localhost"]