Commit 1bcfcc13 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop'

parents e18a122c 2c48b55b

config/.meepctl-repocfg.yaml

+14 −4
Original line number Diff line number Diff line 
version: 1.6.7

version: 1.7.1

repo:

  name: AdvantEDGE
@@ -6,6 +6,13 @@ repo: 
  #  Deployment

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

  deployment:

    # permissions

    permissions:

      # user id

      uid: 1001

      # group id

      gid: 1001



    # user supplied resources

    user:

      # user supplied frontend UI located @ .meep/user/frontend
@@ -35,6 +42,8 @@ repo: 
    auth:

      # enable authentication & authorization

      enabled: true

      # Provider-authenticated users allowed (open) or limited to user database (secure)

      provider-mode: open

      # Session config

      session:

        # session encryption key k8s secret (data: encryption-key)
@@ -300,6 +309,7 @@ repo: 
          meep-sandbox-ctrl-api: js-packages/meep-sandbox-ctrl-client

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

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

          meep-auth-svc-client: js-packages/meep-auth-svc-client

      meep-platform-swagger-ui:

        # location of source code

        src: js-apps/meep-swagger-ui
@@ -625,7 +635,7 @@ repo: 
      # enable meepctl deploy/delete

      deploy: true

      # location of deployment chart

      chart: charts/nginx-ingress

      chart: charts/ingress-nginx

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-ingress.yaml

    meep-redis:
@@ -720,9 +730,9 @@ repo: 
        src: go-packages/meep-logger

        # supports linting

        lint: true

      meep-metric-store:

      meep-metrics:

        # location of source code

        src: go-packages/meep-metric-store

        src: go-packages/meep-metrics

        # supports linting

        lint: true

      meep-metrics-engine-notification-client:

config/values/meep-prometheus.yaml

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ additionalPrometheusRulesMap: 
    - name: Node Alerts

      rules:

      - alert: HostRebooted

        expr: changes(node_boot_time_seconds[1d]) > 0

        expr: changes(node_boot_time_seconds[10m]) > 0

        for: 0m

        labels:

          severity: warning
@@ -96,13 +96,13 @@ additionalPrometheusRulesMap: 
          summary: Kubernetes pod crash looping (instance {{ $labels.instance }})

          description: Pod {{ $labels.pod }} is crash looping\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}

      - alert: KubernetesPodNotHealthy

        expr: min_over_time(sum by (namespace, pod) (kube_pod_status_phase{phase=~"Pending|Unknown|Failed"})[1h:]) > 0

        for: 0m

        expr: min_over_time(sum by (namespace, pod) (kube_pod_status_phase{phase=~"Pending|Unknown|Failed"})[15m:]) > 0

        for: 5m

        labels:

          severity: critical

        annotations:

          summary: Kubernetes Pod not healthy (instance {{ $labels.instance }})

          description: Pod has been in a non-ready state for longer than an hour.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}

          description: Pod has been in a non-ready state for more than 5 minutes in the last 15 minutes.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}



alertmanager:

  enabled: true
@@ -137,7 +137,7 @@ alertmanager: 
          {{- end }}

        text: >-

          {{ range .Alerts -}}

          *Alert:* {{ .Annotations.title }}{{ if .Labels.severity }} - `{{ .Labels.severity }}`{{ end }}

          *Alert:* {{ .Annotations.summary }}{{ if .Labels.severity }} - `{{ .Labels.severity }}`{{ end }}



          *Description:* {{ .Annotations.description }}

js-apps/frontend/src/js/containers/app-container.js

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ class AppContainer extends Component { 
    this.props.changeSignInStatus(STATUS_SIGNING_IN);



    // Navigate to OAuth login endpoint

    window.location.href = HOST_PATH + '/auth/v1/login?provider=' + provider;

    window.location.href = HOST_PATH + '/auth/v1/login?provider=' + provider + '&sbox=true';

  }



  updateAutomation(pauseButtonEnabled) {

js-apps/swagger-ui/rnis-api.yaml

+4 −2
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ info: 
<p>Supported subscriptions:

<p> - CellChangeSubscription

<p> - RabEstSubscription

<p> - RabRelSubscription'

<p> - RabRelSubscription

<p> - MeasRepUeSubscription

<p> - MrMeasRepUeSubscription'

  license:

    name: BSD-3-Clause

    url: 'https://forge.etsi.org/legal-matters'
@@ -131,7 +133,7 @@ paths: 
  /queries/layer2_meas:

    get:

      tags:

      - 'unsupported'

      - 'rni'

      summary: 'Retrieve information on layer 2 measurements'

      description: 'Queries information about the layer 2 measurements.'

      operationId: layer2_meas_infoGET