Commit 068ed0f7 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'release-1.3.0'

parents 4ce29775 b27cde41

.meepctl-repocfg.yaml

+26 −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.2.0

version: 1.3.0

repo:

  name: AdvantEDGE

  core:
@@ -27,7 +27,10 @@ repo: 
      chart: charts/meep-ctrl-engine

      codecov: true

      lint: true

      nodeport: 30000

      api: go-apps/meep-ctrl-engine/api/swagger.yaml

      docker-data:

        api: bin/meep-swagger-ui

        static: bin/meep-frontend

    meep-frontend:

      src: js-apps/meep-frontend
@@ -36,6 +39,18 @@ repo: 
      lint: true

      local-deps:

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

    meep-swagger-ui:

      src: js-apps/meep-swagger-ui

      bin: bin/meep-swagger-ui

      codecov: false

      lint: false

      api-bundle:

        - meep-ctrl-engine

        - meep-metrics-engine

        - meep-mg-manager

        - meep-mg-app-notification

        - meep-loc-serv

        - meep-loc-serv-notification

    meep-webhook:

      src: go-apps/meep-webhook

      bin: bin/meep-webhook
@@ -50,6 +65,8 @@ repo: 
      chart: charts/meep-mg-manager

      codecov: true

      lint: true

      nodeport: 30005

      api: go-apps/meep-mg-manager/api/swagger.yaml

    meep-mon-engine:

      src: go-apps/meep-mon-engine

      bin: bin/meep-mon-engine
@@ -66,6 +83,8 @@ repo: 
        - -mod=vendor

      codecov: true

      lint: true

      nodeport: 30007

      api: go-apps/meep-loc-serv/api/swagger.yaml

    meep-metrics-engine:

      src: go-apps/meep-metrics-engine

      bin: bin/meep-metrics-engine
@@ -74,6 +93,8 @@ repo: 
        - -mod=vendor

      codecov: true

      lint: true

      nodeport: 30008

      api: go-apps/meep-metrics-engine/api/swagger.yaml

    meep-tc-engine:

      src: go-apps/meep-tc-engine

      bin: bin/meep-tc-engine
@@ -92,6 +113,10 @@ repo: 
      template: charts/meep-virt-engine/virt-templates

      codecov: true

      lint: true

    meep-loc-serv-notification:

      api: go-packages/meep-loc-serv-notification-client/api/swagger.yaml

    meep-mg-app-notification:

      api: go-packages/meep-mg-app-client/api/swagger.yaml

  dep:

    docker-registry:

      chart: charts/docker-registry

charts/meep-virt-engine/virt-templates/values-template.yaml

+13 −3
Original line number Diff line number Diff line
@@ -55,9 +55,19 @@ deployment: 


  nodeSelector: {}

  tolerations: []

  affinity: {}





  affinity: 

  {{- if .Deployment.PlacementId}}

    nodeAffinity:

      requiredDuringSchedulingIgnoredDuringExecution:

        nodeSelectorTerms:

        - matchExpressions:

          - key: kubernetes.io/hostname

            operator: In

            values:

            - {{.Deployment.PlacementId}}

  {{- else}}

    {}

  {{- end}}



service:

  enabled: {{.Service.Enabled}}

charts/meep-webhook/templates/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -56,4 +56,4 @@ spec: 
        - name: init-{{ .Values.deployment.dependency }}

          image: busybox

          imagePullPolicy: IfNotPresent

          command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }} ; do echo wiating for {{ .Values.deployment.dependency }}; sleep2; done;']
 
          command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }} ; do echo waiting for {{ .Values.deployment.dependency }}; sleep 0.25; done;']

examples/demo1/README.md

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ cd ~/AdvantEDGE/examples/demo1/ 


#### Configure demo specific dashboards



Follow the procedure described in [Scenario Monitoring](../../docs/use/monitoring.md#configure-dashboards). The demo specific dashboard that is loaded can also be found at `~/AdvantEDGE/examples/demo1/demo1-dashboards.json`

Follow the procedure described in [Scenario Monitoring](https://github.com/InterDigitalInc/AdvantEDGE/wiki/scenario-monitoring#configure-monitoring). The demo specific dashboard that is loaded can also be found at `~/AdvantEDGE/examples/demo1/demo1-dashboards.json`



#### Start iperf proxy

examples/demo1/demo1-dashboards.json

+5 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
      "description": "",

      "version": 1,

      "kibanaSavedObjectMeta": {

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

      }

    }

  },
@@ -131,7 +131,7 @@ 
      "description": "",

      "version": 1,

      "kibanaSavedObjectMeta": {

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

      }

    }

  },
@@ -145,7 +145,7 @@ 
      "description": "",

      "version": 1,

      "kibanaSavedObjectMeta": {

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

      }

    }

  },
@@ -159,7 +159,7 @@ 
      "description": "",

      "version": 1,

      "kibanaSavedObjectMeta": {

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

        "searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"

      }

    }

  }