Merge pull request #91 from monnand/rm-influxdb

Remove support for influxdb until influxdb/influxdb#756 get fixed

storage/influxdb/influxdb.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build ignore
+
 package influxdb
 
 import (
@@ -22,7 +24,7 @@ import (
 
 	"github.com/google/cadvisor/info"
 	"github.com/google/cadvisor/storage"
-	"github.com/influxdb/influxdb-go"
+	"github.com/influxdb/influxdb/client"
 )
 
 type influxdbStorage struct {

storage/influxdb/influxdb_test.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build ignore
+
 package influxdb
 
 import (
@@ -21,7 +23,7 @@ import (
 
 	"github.com/google/cadvisor/storage"
 	"github.com/google/cadvisor/storage/test"
-	"github.com/influxdb/influxdb-go"
+	"github.com/influxdb/influxdb/client"
 )
 
 func runStorageTest(f func(storage.StorageDriver, *testing.T), t *testing.T) {

storagedriver.go

@@ -17,11 +17,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
-	"time"
 
 	"github.com/google/cadvisor/storage"
-	"github.com/google/cadvisor/storage/influxdb"
 	"github.com/google/cadvisor/storage/memory"
 )
 
@@ -43,6 +40,7 @@ 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()
@@ -61,6 +59,7 @@ func NewStorageDriver(driverName string) (storage.StorageDriver, error) {
 				// TODO(monnand): One hour? Or user-defined?
 				1*time.Hour,
 			)
+	*/
 	default:
 		err = fmt.Errorf("Unknown database driver: %v", *argDbDriver)
 	}