Merge pull request #87 from dilallkx/kd_sp44_dev_mon (ee7b274f) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

.meepctl-repocfg.yaml

+21 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		version: 1.4.3
		version: 1.4.4
		repo:
		name: AdvantEDGE

		@@ -31,6 +31,7 @@ repo:
		- -mod=vendor
		codecov: true
		lint: true
		monitor: true
		api: go-apps/meep-mon-engine/api/swagger.yaml
		meep-platform-ctrl:
		src: go-apps/meep-platform-ctrl
		@@ -38,6 +39,7 @@ repo:
		chart: charts/meep-platform-ctrl
		codecov: true
		lint: true
		monitor: true
		api: go-apps/meep-platform-ctrl/api/swagger.yaml
		docker-data:
		swagger: bin/meep-platform-swagger-ui
		@@ -48,6 +50,7 @@ repo:
		chart: charts/meep-virt-engine
		codecov: true
		lint: true
		monitor: true
		docker-data:
		'entrypoint.sh': go-apps/meep-virt-engine/entrypoint.sh
		meep-loc-serv: charts/meep-loc-serv
		@@ -65,6 +68,7 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true

		# Javascript Applications
		js-apps:
		@@ -113,6 +117,7 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-loc-serv/api/swagger.yaml
		meep-metrics-engine:
		src: go-apps/meep-metrics-engine
		@@ -122,6 +127,7 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-metrics-engine/api/v2/swagger.yaml
		meep-mg-manager:
		src: go-apps/meep-mg-manager
		@@ -129,6 +135,7 @@ repo:
		chart: charts/meep-mg-manager
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-mg-manager/api/swagger.yaml
		meep-rnis:
		src: go-apps/meep-rnis
		@@ -138,6 +145,7 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-rnis/api/swagger.yaml
		meep-sandbox-ctrl:
		src: go-apps/meep-sandbox-ctrl
		@@ -145,6 +153,7 @@ repo:
		chart: charts/meep-sandbox-ctrl
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-sandbox-ctrl/api/swagger.yaml
		docker-data:
		'entrypoint.sh': go-apps/meep-sandbox-ctrl/entrypoint.sh
		@@ -155,11 +164,13 @@ repo:
		chart: charts/meep-tc-engine
		codecov: false
		lint: true
		monitor: true
		meep-tc-sidecar:
		src: go-apps/meep-tc-sidecar
		bin: bin/meep-tc-sidecar
		codecov: false
		lint: true
		monitor: false

		#------------------------------
		# Dependencies
		@@ -167,22 +178,31 @@ repo:
		dep:
		meep-couchdb:
		chart: charts/couchdb
		monitor: true
		meep-docker-registry:
		chart: charts/docker-registry
		monitor: true
		meep-grafana:
		chart: charts/grafana
		monitor: true
		meep-influxdb:
		chart: charts/influxdb
		monitor: true
		meep-kube-state-metrics:
		chart: charts/kube-state-metrics
		monitor: true
		meep-ingress:
		chart: charts/nginx-ingress
		monitor: true
		meep-redis:
		chart: charts/redis
		monitor: true
		meep-open-map-tiles:
		chart: charts/open-map-tiles
		monitor: true
		meep-postgis:
		chart: charts/postgis
		monitor: true

		#------------------------------
		# Packages

charts/meep-mon-engine/templates/deployment.yaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,11 @@ spec:
		ports:
		- containerPort: {{ .Values.deployment.port }}
		protocol: {{ .Values.deployment.protocol }}
		env:
		{{- range $key, $value := .Values.image.env }}
		- name: {{ $key }}
		value: {{ $value }}
		{{- end }}
		{{- if .Values.codecov.enabled}}
		volumeMounts:
		- name: codecov-storage

charts/meep-mon-engine/values.yaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@ image:
		repository: meep-mon-engine
		tag: latest
		pullPolicy: Always
		env:
		# Provide comma-spearated list of expected pods to be monitored
		MEEP_DEPENDENCY_PODS: ""
		MEEP_CORE_PODS: ""
		MEEP_SANDBOX_PODS: ""

		service:
		type: ClusterIP

go-apps/meep-mon-engine/go.mod

+4 −3

Original line number	Diff line number	Diff line
		@@ -5,8 +5,9 @@ go 1.12
		require (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0 // indirect
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-store v0.0.0
		github.com/gogo/protobuf v1.2.1 // indirect
		github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
		github.com/google/btree v1.0.0 // indirect
		@@ -35,8 +36,8 @@ require (

		replace (
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr => ../../go-packages/meep-data-key-mgr
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis
		github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-store => ../../go-packages/meep-sandbox-store
		)

go-apps/meep-mon-engine/go.sum

+0 −6

Original line number	Diff line number	Diff line
		@@ -2,10 +2,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
		github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM=
		github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y=
		github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM=
		github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY=
		github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30=
		github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw=
		github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
		github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
		github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
		github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
		@@ -37,7 +33,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
		github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
		github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
		github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
		github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237/go.mod h1:UOnLAUmVG5paym8pD3C4B9BQylUDC2vXFJJpT7JrlEA=
		github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
		github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
		github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
		@@ -88,7 +83,6 @@ k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 h1:tT6oQBi0qwLbbZSfDkdIsb
		k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
		k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
		k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
		k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
		k8s.io/klog v0.0.0-20181108234604-8139d8cb77af h1:s6rm8OxBbyDNSRkpyAd5OL4icUdBICVw9+mFADa+t5E=
		k8s.io/klog v0.0.0-20181108234604-8139d8cb77af/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
		sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=