Commit e982a907 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop' into frontend-dev

parents d27f4712 b4e5701a

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}}

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\"}}]}"

      }

    }

  }

examples/demo1/src/demo-frontend/src/css/demo-svc.scss

+51 −45
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */



// Set IDCC color theme

$mdc-theme-primary: #379DD8;

$mdc-theme-secondary: #FF9800;

$mdc-theme-primary: #379dd8;

$mdc-theme-secondary: #ff9800;

$mdc-theme-background: #fff;



// Set default margin to 0px
@@ -76,7 +76,7 @@ select { 
//     padding-bottom: 4px;

// }

#idcc-title {

    font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;

  font-family: "Gill Sans", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif;

  font-size: 22px;

}

#page-status {
@@ -92,6 +92,16 @@ select { 
  padding-left: 16px;

}



// Image

.img-wrap {

  height: 100%;

  width: 100%;

  overflow: hidden;

}

#demo-svc-app-pic {

  height: 100%;

}



// IDCC Styles



.idcc-button {
@@ -110,6 +120,9 @@ select { 
.idcc-fullwidth {

  width: 100%;

}

.idcc-fullheight {

  height: 100%;

}

.idcc-width-40 {

  width: 40px;

}
@@ -119,12 +132,5 @@ select { 
}

.idcc-status-ra {

  font-weight: bold;

    color: #FF8000;

}





// Map

#map {

    height: 60vh;

    width: 100%;

  color: #ff8000;

}

examples/demo1/src/demo-frontend/src/index.html

+95 −69

File changed.

Preview size limit exceeded, changes collapsed.