Remove timestamp from Prometheus push gateway

codec.go

@@ -12,7 +12,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/prometheus/client_golang/prometheus"
 	"io/ioutil"
 )

codec_gpb.go

@@ -15,7 +15,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	telem "github.com/cisco/bigmuddy-network-telemetry-proto/proto_go"
 	pdt "github.com/cisco/bigmuddy-network-telemetry-proto/proto_go/old/telemetry"
 	"github.com/golang/protobuf/jsonpb"

crypt.go

@@ -11,18 +11,16 @@
 package main
 
 import (
-	"bufio"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/sha256"
 	"crypto/x509"
 	"encoding/base64"
 	"encoding/pem"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"golang.org/x/crypto/ssh/terminal"
 	"io/ioutil"
-	"os"
+
+	log "github.com/sirupsen/logrus"
 )
 
 func collect_pkey(pemFile string) (err error, key *rsa.PrivateKey) {
@@ -96,34 +94,36 @@ type cryptUserPasswordCollector struct {
 func cryptCollect(name string, authenticator string) (
 	error, string, string) {
 
-	b := bufio.NewReader(os.Stdin)
-	for {
-		fmt.Printf("\nCRYPT Client [%s],[%v]\n Enter username: ",
-			name, authenticator)
-		user, more, err := b.ReadLine()
-		if more {
-			fmt.Printf("Username too long")
-			continue
-		}
-		if err != nil {
-			fmt.Printf("Failed to collect username")
-			continue
-		}
-		if string(user) == "" {
-			fmt.Println("Empty username, try again")
-			continue
-		}
-		fmt.Printf(" Enter password: ")
-		pw, err := terminal.ReadPassword(int(os.Stdin.Fd()))
-		if err != nil {
-			fmt.Printf("Failed to collect password")
-			continue
-		}
-
-		fmt.Printf("\n")
+	// b := bufio.NewReader(os.Stdin)
+	// for {
+	// 	fmt.Printf("\nCRYPT Client [%s],[%v]\n Enter username: ",
+	// 		name, authenticator)
+	// 	user, more, err := b.ReadLine()
+	// 	if more {
+	// 		fmt.Printf("Username too long")
+	// 		continue
+	// 	}
+	// 	if err != nil {
+	// 		fmt.Printf("Failed to collect username")
+	// 		continue
+	// 	}
+	// 	if string(user) == "" {
+	// 		fmt.Println("Empty username, try again")
+	// 		continue
+	// 	}
+	// 	fmt.Printf(" Enter password: ")
+	// 	pw, err := terminal.ReadPassword(int(os.Stdin.Fd()))
+	// 	if err != nil {
+	// 		fmt.Printf("Failed to collect password")
+	// 		continue
+	// 	}
+
+	// 	fmt.Printf("\n")
+
+	// 	return nil, string(user), string(pw)
+	// }
+	return nil, string("admin"), string("admin")
 
-		return nil, string(user), string(pw)
-	}
 }
 
 func (c *cryptUserPasswordCollector) getUP() (string, string, error) {

glide.yaml

@@ -1,7 +1,7 @@
 package: bigmuddy-network-telemetry-pipeline
 import:
 - package: github.com/Shopify/sarama
-- package: github.com/Sirupsen/logrus
+- package: github.com/sirupsen/logrus
 - package: github.com/dlintw/goconf
 - package: github.com/evalphobia/logrus_fluent
 - package: github.com/golang/protobuf

mdt_msg_samples/samples.go

@@ -13,7 +13,7 @@ package mdt_msg_samples
 import (
 	"bufio"
 	"encoding/json"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	telem "github.com/cisco/bigmuddy-network-telemetry-proto/proto_go"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"

message_router.go

@@ -9,7 +9,7 @@
 package main
 
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"time"
 )
 

message_router_test.go

@@ -10,7 +10,7 @@ package main
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	telem "github.com/cisco/bigmuddy-network-telemetry-proto/proto_go"
 	"github.com/dlintw/goconf"
 	"testing"

metamonitoring.go

@@ -13,7 +13,7 @@ package main
 // the aim of having stats scraped by prometheus.
 //
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/prometheus/client_golang/prometheus"
 	"net/http"
 )

metrics.go

@@ -15,7 +15,7 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/prometheus/client_golang/prometheus"
 	"io/ioutil"
 	"os"

metrics_influx.go

@@ -25,11 +25,12 @@ package main
 import (
 	"bufio"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/influxdata/influxdb/client/v2"
 	"os"
 	"runtime"
 	"time"
+
+	client "github.com/influxdata/influxdb1-client/v2"
+	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -127,11 +128,11 @@ func (w *metricsInfluxOutputWorker) worker(m *metricsOutputModule) {
 		//
 		// Add tls config here.
 		if !outputHandler.standalone {
-			var user, passw string
-			user, passw, err = outputHandler.auth.getUP()
+			// var user, passw string
+			// user, passw, err = outputHandler.auth.getUP()
 			if err == nil {
 				influxClient, err = client.NewHTTPClient(client.HTTPConfig{
-					Addr: w.influxServer, Username: user, Password: passw,
+					Addr: w.influxServer,
 				})
 			}
 		}

metrics_prometheus.go

@@ -13,13 +13,14 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"hash/fnv"
 	"net/http"
 	"net/url"
 	"os"
 	"regexp"
 	"strings"
+
+	log "github.com/sirupsen/logrus"
 )
 
 //
@@ -171,8 +172,7 @@ func (p *metricsPrometheusOutputHandler) buildMetric(
 	} else {
 		delim = " "
 	}
-
-	buf.WriteString(fmt.Sprintf("%s%v %v\n", delim, sensor.val, ts))
+	buf.WriteString(fmt.Sprintf("%s%v\n", delim, sensor.val))
 }
 
 func (p *metricsPrometheusOutputHandler) worker(m *metricsOutputModule) {

pipeline.go

@@ -23,7 +23,7 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	telem "github.com/cisco/bigmuddy-network-telemetry-proto/proto_go"
 	"github.com/dlintw/goconf"
 	"github.com/evalphobia/logrus_fluent"

pipeline_test.go

@@ -11,7 +11,7 @@ package main
 import (
 	"bytes"
 	"encoding/binary"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	samples "github.com/cisco/bigmuddy-network-telemetry-pipeline/mdt_msg_samples"
 	"net"
 	"testing"

replay.go

@@ -16,7 +16,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"io"
 	"os"
 	"time"

tap.go

@@ -16,7 +16,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"os"
 	"time"
 )