From 2d3f8d9f0f13dfaa0c878176fae031385b07dcda Mon Sep 17 00:00:00 2001
From: Nan Deng <dengnan@google.com>
Date: Thu, 17 Jul 2014 14:36:19 -0700
Subject: [PATCH] re-enable influxdb

---
 storage/influxdb/influxdb.go      |  2 --
 storage/influxdb/influxdb_test.go |  2 --
 storagedriver.go                  | 39 ++++++++++++++++---------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/storage/influxdb/influxdb.go b/storage/influxdb/influxdb.go
index 73ad78b0..22209940 100644
--- a/storage/influxdb/influxdb.go
+++ b/storage/influxdb/influxdb.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build ignore
-
 package influxdb
 
 import (
diff --git a/storage/influxdb/influxdb_test.go b/storage/influxdb/influxdb_test.go
index 6dd675a6..af69158b 100644
--- a/storage/influxdb/influxdb_test.go
+++ b/storage/influxdb/influxdb_test.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build ignore
-
 package influxdb
 
 import (
diff --git a/storagedriver.go b/storagedriver.go
index e5136b2f..3de3f85d 100644
--- a/storagedriver.go
+++ b/storagedriver.go
@@ -17,8 +17,11 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"time"
 
 	"github.com/google/cadvisor/storage"
+	"github.com/google/cadvisor/storage/influxdb"
 	"github.com/google/cadvisor/storage/memory"
 )
 
@@ -40,26 +43,24 @@ func NewStorageDriver(driverName string) (storage.StorageDriver, error) {
 	case "memory":
 		storageDriver = memory.New(*argSampleSize, *argHistoryDuration)
 		return storageDriver, nil
-	/*
-		case "influxdb":
-			var hostname string
-			hostname, err = os.Hostname()
-			if err != nil {
-				return nil, err
-			}
+	case "influxdb":
+		var hostname string
+		hostname, err = os.Hostname()
+		if err != nil {
+			return nil, err
+		}
 
-			storageDriver, err = influxdb.New(
-				hostname,
-				"cadvisorTable",
-				*argDbName,
-				*argDbUsername,
-				*argDbPassword,
-				*argDbHost,
-				*argDbIsSecure,
-				// TODO(monnand): One hour? Or user-defined?
-				1*time.Hour,
-			)
-	*/
+		storageDriver, err = influxdb.New(
+			hostname,
+			"cadvisorTable",
+			*argDbName,
+			*argDbUsername,
+			*argDbPassword,
+			*argDbHost,
+			*argDbIsSecure,
+			// TODO(monnand): One hour? Or user-defined?
+			1*time.Hour,
+		)
 	default:
 		err = fmt.Errorf("Unknown database driver: %v", *argDbDriver)
 	}