Commit d86f59c6 authored by Simon Pastor's avatar Simon Pastor
Browse files

pr review

parent 88b829c5

.meepctl-repocfg.yaml

+6 −7
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ repo: 
          meep-platform-ctrl-api: js-packages/meep-platform-ctrl-client

          meep-sandbox-ctrl-api: js-packages/meep-sandbox-ctrl-client

          meep-mon-engine-api: js-packages/meep-mon-engine-client

          meep-metrics-engine-api: js-packages/meep-metrics-engine-client

          meep-gis-engine-api: js-packages/meep-gis-engine-client

      meep-platform-swagger-ui:

        src: js-apps/meep-swagger-ui
@@ -255,13 +254,13 @@ repo: 
      meep-logger:

        src: go-packages/meep-logger

        lint: true

      meep-metric-store:

        src: go-packages/meep-metric-store

        lint: true

      meep-metrics-engine-notification-client:

        src: go-packages/meep-metrics-engine-notification-client

        lint: false

        api: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml

      meep-metric-store:

        src: go-packages/meep-metric-store

        lint: true

      meep-mg-app-client:

        src: go-packages/meep-mg-app-client

        lint: false
@@ -309,6 +308,9 @@ repo: 


    # Javascript Packages

    js-packages:

      meep-metrics-engine-client:

        src: js-packages/meep-metrics-engine-client

        lint: false

      meep-mon-engine-client:

        src: js-packages/meep-mon-engine-client

        lint: false
@@ -318,7 +320,4 @@ repo: 
      meep-sandbox-ctrl-client:

        src: js-packages/meep-sandbox-ctrl-client

        lint: false

      meep-metrics-engine-client:

        src: js-packages/meep-metrics-engine-client

        lint: false

go-packages/meep-metric-store/http_test.go

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ func TestHttpMetricsGetSet(t *testing.T) { 
	if err != nil || len(h) != 2 {

		t.Fatalf("Failed to get metric")

	}

	h, err = ms.GetHttpMetric("logger1,logger2", "RX", "", 0)

	if err != nil || len(h) != 2 {

		t.Fatalf("Failed to get metric")

	}



	// t.Fatalf("DONE")

}

go-packages/meep-metric-store/metric-store.go

+3 −3
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ func (ms *MetricStore) GetInfluxMetric(metric string, tags map[string]string, fi 
			}

			tagStr += k + "='" + v + "'"

		}

		tagStr += ")";

		tagStr += ")"

	}

	if duration != "" {

		if tagStr == "" {

js-apps/meep-frontend/package-lock.json

+5 −5
Original line number Diff line number Diff line
@@ -9958,7 +9958,7 @@ 
      "requires": {

        "is-in-browser": "^1.1.3",

        "symbol-observable": "^1.1.0",

        "warning": "^3.0.0"

        "warning": "^4.0.1"

      }

    },

    "jss-camel-case": {
@@ -9974,7 +9974,7 @@ 
      "resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz",

      "integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==",

      "requires": {

        "warning": "^3.0.0"

        "warning": "^4.0.1"

      }

    },

    "jss-default-unit": {
@@ -9992,7 +9992,7 @@ 
      "resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz",

      "integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==",

      "requires": {

        "warning": "^3.0.0"

        "warning": "^4.0.1"

      }

    },

    "jss-global": {
@@ -10005,7 +10005,7 @@ 
      "resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz",

      "integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==",

      "requires": {

        "warning": "^3.0.0"

        "warning": "^4.0.1"

      }

    },

    "jss-preset-default": {
@@ -10035,7 +10035,7 @@ 
      "resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz",

      "integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==",

      "requires": {

        "warning": "^3.0.0"

        "warning": "^4.0.1"

      }

    },

    "jss-vendor-prefixer": {