Unverified Commit 60b89f9e authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #54 from dilallkx/kd_sp34_metrics 

Real-time Metrics
parents 3e2eac25 eed99b98

examples/demo1/src/demo-server/go/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 0.0.1

- Build date: 2019-12-18T10:53:00.141-05:00

- Build date: 2020-01-06T22:50:01.559-05:00





### Running the server

examples/demo1/src/iperf-proxy/go/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 0.0.1

- Build date: 2019-12-18T10:53:02.347-05:00

- Build date: 2020-01-06T22:50:03.001-05:00





### Running the server

go-apps/meep-ctrl-engine/server/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 1.0.0

- Build date: 2019-12-18T10:52:44.717-05:00

- Build date: 2020-01-06T22:49:51.404-05:00





### Running the server

go-apps/meep-ctrl-engine/server/ctrl-engine.go

+5 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ func CtrlEngineInit() (err error) { 
	}



	// Connect to Metric Store

	metricStore, err = ms.NewMetricStore("", influxDBAddr)

	metricStore, err = ms.NewMetricStore("", influxDBAddr, redisDBAddr)

	if err != nil {

		log.Error("Failed connection to Redis: ", err)

		return err
@@ -370,14 +370,13 @@ func ceActivateScenario(w http.ResponseWriter, r *http.Request) { 
		return

	}



	// Set Metrics Store & Flush entries

	// Set Metrics Store

	err = metricStore.SetStore(scenarioName)

	if err != nil {

		log.Error(err.Error())

		http.Error(w, err.Error(), http.StatusInternalServerError)

		return

	}

	metricStore.Flush()



	// Activate scenario & publish

	err = activeModel.SetScenario(scenario)
@@ -596,7 +595,9 @@ func ceSendEvent(w http.ResponseWriter, r *http.Request) { 
	// Log successful event in metric store

	eventStr, err := json.Marshal(event)

	if err == nil {

		err = metricStore.SetEventMetric(eventType, string(eventStr))

		var metric ms.EventMetric

		metric.Event = string(eventStr)

		err = metricStore.SetEventMetric(eventType, metric)

	}

	if err != nil {

		log.Error("Failed to set event metric")

go-apps/meep-loc-serv/server/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 1.1.1

- Build date: 2019-12-18T10:52:56.480-05:00

- Build date: 2020-01-06T22:49:59.253-05:00





### Running the server