Merge pull request #29 from linkernetworks/phstsai/prometheus-client

DEV: Phstsai/prometheus client

.travis.yml

@@ -22,6 +22,7 @@ install:
   - make pre-build
 
 script:
+  - docker run --name prometheus -d -p 9090:9090 prom/prometheus
   - make build
   - sudo -E PATH=$PATH TEST_GRPC=1 make src.test-coverage
   - docker build --tag sdnvortex/vortex --file ./dockerfiles/Dockerfile .
@@ -36,5 +37,6 @@ deploy:
     branch: develop
 
 after_success:
+  - docker rm -f prometheus
   - cp build/src/coverage.txt coverage.txt
   - bash <(curl -s https://codecov.io/bash)

config/k8s.json

@@ -19,6 +19,9 @@
             "url": "mongodb://35.189.177.37:31717/votex"
         }
     },
+    "prometheus": {
+        "url": "http://prometheus.monitoring.svc.cluster.local:30003"
+    },
     "logger": {
         "dir": "./logs",
         "level": "debug",
@@ -37,4 +40,4 @@
         "version": "<GIT_COMMIT>",
         "logFileName": "access_log"
     }
-}
+}

config/local.json

@@ -9,6 +9,9 @@
     "mongo": {
         "url": "mongodb://localhost:27017/vortex_test"
     },
+    "prometheus": {
+        "url": "http://localhost:30003"
+    },
     "logger": {
         "dir": "./logs",
         "level": "debug",
@@ -26,4 +29,4 @@
         "version": "local",
         "logFileName": "access_log"
     }
-}
+}

config/testing.json

@@ -9,6 +9,9 @@
   "mongo": {
     "url": "mongodb://localhost:27017/vortex_test"
   },
+  "prometheus": {
+    "url": "http://localhost:9090"
+  },
   "logger": {
     "dir": "./logs",
     "level": "debug",
@@ -26,4 +29,4 @@
     "version": "local",
     "logFileName": "access_log"
   }
-}
+}

deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml

@@ -22,8 +22,6 @@ spec:
         ports:
         - name: http-metrics
           containerPort: 8080
-        - name: telemetry
-          containerPort: 8081
         readinessProbe:
           httpGet:
             path: /healthz

deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-service.yaml

@@ -13,10 +13,6 @@ spec:
     port: 8080
     targetPort: http-metrics
     protocol: TCP
-  - name: telemetry
-    port: 8081
-    targetPort: telemetry
-    protocol: TCP
   selector:
     k8s-app: kube-state-metrics
 

deploy/kubernetes/apps/monitoring/prometheus/prometheus-config.yaml

@@ -11,6 +11,12 @@ data:
       scrape_timeout: 15s
     scrape_configs:
 
+      
+    - job_name: 'prometheus'
+      static_configs:
+        - targets: ['localhost:9090']
+
+
     - job_name: 'kubernetes-service-endpoints'
       kubernetes_sd_configs:
       - role: endpoints

deploy/kubernetes/service/mongodb/service-external.yaml

@@ -5,7 +5,6 @@ metadata:
   labels:
     environment: testing
   name: mongo-external
-  namespace: default
 spec:
   externalTrafficPolicy: Cluster
   ports:
@@ -15,7 +14,6 @@ spec:
     protocol: TCP
     targetPort: 27017
   selector:
-    podindex: "0"
     service: mongo
   sessionAffinity: None
   type: NodePort

jenkins/entry.sh

@@ -9,6 +9,7 @@ echo 'jenkins:x:'$UID':'$GID':,,,:/home/jenkins:/bin/bash' >> /etc/passwd
 sudo service docker start
 mkdir -p /home/jenkins/data/mongo
 nohup mongod --dbpath=/home/jenkins/data/mongo 2>&1 > /dev/null &
+docker run --name prometheus -d -p 9090:9090 prom/prometheus
 
 sudo chown -R jenkins:jenkins /home/jenkins
 

src/config/config.go

@@ -8,12 +8,14 @@ import (
 	"github.com/linkernetworks/logger"
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/redis"
+	"github.com/linkernetworks/vortex/src/prometheus"
 )
 
 type Config struct {
-	Redis  *redis.RedisConfig  `json:"redis"`
-	Mongo  *mongo.MongoConfig  `json:"mongo"`
-	Logger logger.LoggerConfig `json:"logger"`
+	Redis      *redis.RedisConfig           `json:"redis"`
+	Mongo      *mongo.MongoConfig           `json:"mongo"`
+	Prometheus *prometheus.PrometheusConfig `json:"prometheus"`
+	Logger     logger.LoggerConfig          `json:"logger"`
 
 	// the version settings of the current application
 	Version string `json:"version"`

src/prometheus/promehteus.go

@@ -0,0 +1,36 @@
+package prometheus
+
+import (
+	"github.com/linkernetworks/logger"
+	"github.com/prometheus/client_golang/api"
+	prometheus "github.com/prometheus/client_golang/api/prometheus/v1"
+)
+
+type PrometheusConfig struct {
+	Url string `json:"url"`
+}
+
+type Service struct {
+	Url string
+	API prometheus.API
+}
+
+func New(url string) *Service {
+	conf := api.Config{
+		Address:      url,
+		RoundTripper: api.DefaultRoundTripper,
+	}
+
+	client, err := api.NewClient(conf)
+	if err != nil {
+		// TODO should return error to server
+		logger.Warnf("error while creating api.NewClient %s", err)
+	}
+
+	newAPI := prometheus.NewAPI(client)
+
+	return &Service{
+		Url: url,
+		API: newAPI,
+	}
+}

src/server/handler_prometheus.go

@@ -0,0 +1,38 @@
+package server
+
+import (
+	"fmt"
+	"net/http"
+	"time"
+
+	restful "github.com/emicklei/go-restful"
+	response "github.com/linkernetworks/vortex/src/net/http"
+	"github.com/linkernetworks/vortex/src/net/http/query"
+	"github.com/linkernetworks/vortex/src/web"
+	"golang.org/x/net/context"
+)
+
+func queryMetrics(ctx *web.Context) {
+	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
+
+	query := query.New(req.Request.URL.Query())
+
+	query_str := ""
+	if q, ok := query.Str("query"); ok {
+		query_str = q
+	}
+
+	api := sp.Prometheus.API
+
+	testTime := time.Now()
+	result, err := api.Query(context.Background(), query_str, testTime)
+
+	if result == nil {
+		response.BadRequest(req.Request, resp.ResponseWriter, fmt.Errorf("%v: %v", result, err))
+	}
+
+	resp.WriteJson(map[string]interface{}{
+		"status":  http.StatusOK,
+		"results": result,
+	}, restful.MIME_JSON)
+}

src/server/handler_prometheus_test.go

@@ -0,0 +1,60 @@
+package server
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	restful "github.com/emicklei/go-restful"
+	"github.com/linkernetworks/vortex/src/config"
+	"github.com/linkernetworks/vortex/src/serviceprovider"
+	prometheus "github.com/prometheus/client_golang/api/prometheus/v1"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+)
+
+type PrometheusTestSuite struct {
+	suite.Suite
+	wc  *restful.Container
+	api prometheus.API
+}
+
+func (suite *PrometheusTestSuite) SetupSuite() {
+	cf := config.MustRead("../../config/testing.json")
+	sp := serviceprovider.NewForTesting(cf)
+
+	//init session
+	suite.api = sp.Prometheus.API
+
+	//init restful container
+	suite.wc = restful.NewContainer()
+	service := newMonitoringService(sp)
+	suite.wc.Add(service)
+}
+
+func TestPrometheusTestSuite(t *testing.T) {
+	suite.Run(t, new(PrometheusTestSuite))
+}
+
+func (suite *PrometheusTestSuite) TearDownSuite() {
+}
+
+func (suite *PrometheusTestSuite) TestQueryMetrics() {
+
+	httpRequest, err := http.NewRequest("GET", "http://localhost:7890/v1/monitoring/query?query=prometheus_build_info", nil)
+	assert.NoError(suite.T(), err)
+
+	httpWriter := httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+}
+
+func (suite *PrometheusTestSuite) TestQueryWrongMetrics() {
+
+	httpRequest, err := http.NewRequest("GET", "http://localhost:7890/v1/monitoring/query?query=!@#$", nil)
+	assert.NoError(suite.T(), err)
+
+	httpWriter := httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusBadRequest, httpWriter)
+}

src/server/route.go

@@ -18,6 +18,7 @@ func (a *App) AppRoute() *mux.Router {
 	container.Add(newNetworkService(a.ServiceProvider))
 	container.Add(newStorageProviderService(a.ServiceProvider))
 	container.Add(newVolumeService(a.ServiceProvider))
+	container.Add(newMonitoringService(a.ServiceProvider))
 
 	router.PathPrefix("/v1/").Handler(container)
 	return router
@@ -56,3 +57,10 @@ func newVolumeService(sp *serviceprovider.Container) *restful.WebService {
 	webService.Route(webService.DELETE("/{id}").To(handler.RESTfulServiceHandler(sp, deleteVolume)))
 	return webService
 }
+
+func newMonitoringService(sp *serviceprovider.Container) *restful.WebService {
+	webService := new(restful.WebService)
+	webService.Path("/v1/monitoring").Consumes(restful.MIME_JSON, restful.MIME_JSON).Produces(restful.MIME_JSON, restful.MIME_JSON)
+	webService.Route(webService.GET("/query").To(handler.RESTfulServiceHandler(sp, queryMetrics)))
+	return webService
+}

src/serviceprovider/serviceprovider.go

@@ -2,11 +2,13 @@ package serviceprovider
 
 import (
 	"fmt"
-	"github.com/linkernetworks/logger"
-	"github.com/linkernetworks/vortex/src/config"
 	"os"
 	"path/filepath"
 
+	"github.com/linkernetworks/logger"
+	"github.com/linkernetworks/vortex/src/config"
+	"github.com/linkernetworks/vortex/src/prometheus"
+
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/redis"
 	kubeCtl "github.com/linkernetworks/vortex/src/kubernetes"
@@ -18,10 +20,11 @@ import (
 )
 
 type Container struct {
-	Config  config.Config
-	Redis   *redis.Service
-	Mongo   *mongo.Service
-	KubeCtl *kubeCtl.KubeCtl
+	Config     config.Config
+	Redis      *redis.Service
+	Mongo      *mongo.Service
+	Prometheus *prometheus.Service
+	KubeCtl    *kubeCtl.KubeCtl
 }
 
 type ServiceDiscoverResponse struct {
@@ -40,6 +43,9 @@ func New(cf config.Config) *Container {
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
+	logger.Infof("Connecting to prometheus: %s", cf.Prometheus.Url)
+	prometheus := prometheus.New(cf.Prometheus.Url)
+
 	kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config")
 	k8s, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
 	if err != nil {
@@ -52,10 +58,11 @@ func New(cf config.Config) *Container {
 	clientset := kubernetes.NewForConfigOrDie(k8s)
 
 	sp := &Container{
-		Config:  cf,
-		Redis:   redisService,
-		Mongo:   mongo,
-		KubeCtl: kubeCtl.New(clientset, "default"),
+		Config:     cf,
+		Redis:      redisService,
+		Mongo:      mongo,
+		Prometheus: prometheus,
+		KubeCtl:    kubeCtl.New(clientset, "default"),
 	}
 
 	return sp
@@ -71,13 +78,17 @@ func NewForTesting(cf config.Config) *Container {
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
+	logger.Infof("Connecting to prometheus: %s", cf.Prometheus.Url)
+	prometheus := prometheus.New(cf.Prometheus.Url)
+
 	clientset := fakeclientset.NewSimpleClientset()
 
 	sp := &Container{
-		Config:  cf,
-		Redis:   redisService,
-		Mongo:   mongo,
-		KubeCtl: kubeCtl.New(clientset, "default"),
+		Config:     cf,
+		Redis:      redisService,
+		Mongo:      mongo,
+		Prometheus: prometheus,
+		KubeCtl:    kubeCtl.New(clientset, "default"),
 	}
 
 	return sp

vendor/vendor.json

@@ -396,6 +396,18 @@
 			"revision": "faf4ec335fe01ae5a6a0eaa34a5a9333bfbd1a30",
 			"revisionTime": "2018-06-07T12:36:07Z"
 		},
+		{
+			"checksumSHA1": "4VppKBbzCSmoFfQxGNUm0TYiFCA=",
+			"path": "github.com/prometheus/client_golang/api",
+			"revision": "82f5ff156b29e276022b1a958f7d385870fb9814",
+			"revisionTime": "2018-04-16T23:38:56Z"
+		},
+		{
+			"checksumSHA1": "83pGB3cRG5uqx9O5d+7MCB+TFT4=",
+			"path": "github.com/prometheus/client_golang/api/prometheus/v1",
+			"revision": "77e8f2ddcfed59ece3a8151879efb2304b5cbbcf",
+			"revisionTime": "2018-06-23T15:59:54Z"
+		},
 		{
 			"checksumSHA1": "WVgL9pNO2RZCCcaXfSYSNEPgtCo=",
 			"path": "github.com/prometheus/client_golang/prometheus",