Commit d7e2f5cd authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub Enterprise
Browse files

Merge pull request #4 from wbu-tep/kd_sp07_fix_metrics 

K8s Dashboard Support
parents d41b33ea 9a918648

config/.meepctl-repocfg.yaml

+4 −0
Original line number Diff line number Diff line
@@ -72,7 +72,11 @@ repo: 
    dashboards:

      mec-sandbox: dashboards/mec-sandbox.json

      platform-advantedge: dashboards/platform-advantedge.json

      platform-k8s: dashboards/platform-k8s.json

      runtime-environment-node: dashboards/runtime-environment-node.json

      runtime-environment-k8s-cluster: dashboards/runtime-environment-k8s-cluster.json

      kubelet: dashboards/kubelet.json

      prometheus: dashboards/prometheus.json



  #------------------------------

  #  Resource Prerequisites

js-apps/frontend/src/js/app-constants.js

+2 −0
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ export const ETSI_MEC_OVERVIEW_PDF_URL = 'https://www.etsi.org/images/files/tech 


export const DASHBOARD_MEC_SANDBOX_URL = HOST_PATH + '/grafana/d/mec-sandbox/mec-sandbox?orgId=1&from=now-24h&to=now&refresh=15s&kiosk=tv&theme=light';

export const DASHBOARD_PLATFORM_ADVANTEDGE_URL = HOST_PATH + '/grafana/d/platform-advantedge/platform-advantedge?orgId=1&from=now-24h&to=now&refresh=15s&kiosk=tv&theme=light';

export const DASHBOARD_PLATFORM_K8S_URL = HOST_PATH + '/grafana/d/platform-k8s/platform-k8s?orgId=1&from=now-24h&to=now&refresh=30s&kiosk=tv&theme=light';

export const DASHBOARD_RUNTIME_ENVIRONMENT_NODE_URL = HOST_PATH + '/grafana/d/runtime-environment-node/runtime-environment-node?orgId=1&from=now-24h&to=now&refresh=30s&kiosk=tv&theme=light';

export const DASHBOARD_RUNTIME_ENVIRONMENT_K8S_URL = HOST_PATH + '/grafana/d/runtime-environment-k8s-cluster/runtime-environment-k8s-cluster?orgId=1&from=now-24h&to=now&refresh=30s&kiosk=tv&theme=light';



// IDs

export const SANDBOX_NETWORK_FILES = 'sandbox-network-files';

js-apps/frontend/src/js/containers/top-bar-container.js

+20 −2
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ import { 
  WIKI_REPORT_ISSUE_URL,

  DASHBOARD_MEC_SANDBOX_URL,

  DASHBOARD_PLATFORM_ADVANTEDGE_URL,

  DASHBOARD_RUNTIME_ENVIRONMENT_NODE_URL

  DASHBOARD_PLATFORM_K8S_URL,

  DASHBOARD_RUNTIME_ENVIRONMENT_NODE_URL,

  DASHBOARD_RUNTIME_ENVIRONMENT_K8S_URL

} from '../app-constants';



/*eslint-disable */
@@ -142,7 +144,15 @@ class TopBarContainer extends Component { 
                            this.handleItemClickIfEnabled(PAGE_DASHBOARD, signedIn && isAdmin);

                          }}

                        >

                          <Typography use="body1">Platform (AdvantEDGE)</Typography>

                          <Typography use="body1">Platform (Services)</Typography>

                        </MenuItem>

                        <MenuItem

                          onClick={() => {

                            this.props.changeCurrentDashboard(DASHBOARD_PLATFORM_K8S_URL);

                            this.handleItemClickIfEnabled(PAGE_DASHBOARD, signedIn && isAdmin);

                          }}

                        >

                          <Typography use="body1">Platform (Kubernetes)</Typography>

                        </MenuItem>

                        <MenuItem

                          onClick={() => {
@@ -152,6 +162,14 @@ class TopBarContainer extends Component { 
                        >

                          <Typography use="body1">Runtime Environment (Node)</Typography>

                        </MenuItem>

                        <MenuItem

                          onClick={() => {

                            this.props.changeCurrentDashboard(DASHBOARD_RUNTIME_ENVIRONMENT_K8S_URL);

                            this.handleItemClickIfEnabled(PAGE_DASHBOARD, signedIn && isAdmin);

                          }}

                        >

                          <Typography use="body1">Runtime Environment (Kubernetes)</Typography>

                        </MenuItem>

                      </Menu>



                      <Button