Commit 4c862c19 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop'

parents b4e44e7b ca679995

README.md

+9 −5
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ MEC Sandbox has the following prerequisites: 
     - `vi ~/AdvantEDGE/config/secrets.yaml`

       - Set minio accessKey to object store access key value (minimum 3 chars)

       - Set minio secretKey to object store secret key value (minimum 8 chars)

     - `vi ~/AdvantEDGE/config/thanos.yaml`

     - `vi ~/AdvantEDGE/config/objstore-thanos.yaml`

       - Set endpoint to VM FQDN

         - **NOTE:** Make sure _/etc/hosts_ file contains entry for VM FQDN that points to VM private IP address

       - Set access_key to object store access key value
@@ -99,7 +99,7 @@ MEC Sandbox has the following prerequisites: 
       - Ubuntu 18.04: `python ~/AdvantEDGE/config/configure-secrets.py set ~/AdvantEDGE/config/secrets.yaml`

       - Ubuntu 20.04: `python3 ~/AdvantEDGE/config/configure-secrets.py set ~/AdvantEDGE/config/secrets.yaml`

   - Thanos:

     - `~/AdvantEDGE/config/configure-thanos-secrets.sh`

     - `~/AdvantEDGE/config/configure-objstore-secrets.sh`

   - **NOTE:** Once the kubernetes secrets have been created, it is recommended to remove the config files containing the clear-text secrets

1. Deploy MinIO & Thanos Compactor:

   - Build meepctl:
@@ -114,6 +114,7 @@ MEC Sandbox has the following prerequisites: 
   - Using a browser, access the long-term storage VM via its FQDN

   - Sign in using the provisioned credentials (access key & secret key)

   - Create the following buckets if they do not exist:

     - influx

     - thanos

     - thanos-archive
@@ -141,11 +142,14 @@ MEC Sandbox has the following prerequisites: 
     - Checkout the required AdvantEDGE version tag

1. Configure MEC Sandbox:

   - Configure object store:

     - `vi ~/mec-sandbox/config/thanos.yaml` and `vi ~/mec-sandbox/config/thanos-archive.yaml`

     - `vi ~/mec-sandbox/config/objstore-thanos.yaml` and `vi ~/mec-sandbox/config/objstore-thanos-archive.yaml`

       - Set endpoint to long-term storage VM FQDN

         - **NOTE:** Make sure _/etc/hosts_ file contains entry for VM FQDN that points to VM private IP address (if on same local network)

       - Set access_key to object store access key value 

       - Set secret_key to object store secret key value

     - `vi ~/mec-sandbox/config/objstore-influx.cfg`

       - Set aws_access_key_id to object store access key value 

       - Set aws_secret_access_key to object store secret key value

   - Configure session & OAuth secrets:

     - `vi ~/mec-sandbox/config/secrets.yaml`

       - Set a unique session encryption key
@@ -185,8 +189,8 @@ MEC Sandbox has the following prerequisites: 
     - Install Pyyaml: `pip install pyyaml`

     - Create secrets:

       - `python ~/AdvantEDGE/config/configure-secrets.py set ~/AdvantEDGE/config/secrets.yaml`

   - Thanos:

     - `~/AdvantEDGE/config/configure-thanos-secrets.sh`

   - Object Store (Thanos & Influx):

     - `~/AdvantEDGE/config/configure-objstore-secrets.sh`

   - **NOTE:** Once the kuberentes secrets have been created, it is recommended to remove the config files containing the clear-text secrets

1. Build & Deploy AdvantEDGE:

   - Build meepctl:

config/.meepctl-repocfg.yaml

+67 −14
Original line number Diff line number Diff line 
version: 1.7.2

version: 1.7.4

repo:

  name: AdvantEDGE
@@ -79,6 +79,16 @@ repo: 


    # Metrics Configuration

    metrics:

      # Influx configuration

      influx:

        # enable influx data backups

        enabled: true

        # object store url

        url: https://metrics.try-mec.etsi.org/

        # object store configuration secret

        secret: meep-influx-objstore-config

        # Number of days to retain daily data backups

        retention: 7

      # Prometheus configuration

      prometheus:

        # external labels added to prometheus metrics
@@ -118,7 +128,7 @@ repo: 
            # raw data retention

            resolution-raw: 30d

            # 5m downsampled data retention

            resolution-5m: 30d

            resolution-5m: 60d

            # 1h downsampled data retention

            resolution-1h: 10y

      # Thanos long-term storage archive
@@ -173,7 +183,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-auth-svc/api/swagger.yaml

        api:

          meep-auth-svc: go-apps/meep-auth-svc/api/swagger.yaml

        # AdvantEDGE resources included in Docker container image

        docker-data:

          # location of REST API permissions file
@@ -214,7 +225,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

        # list of dependencies pods to monitor

        dependency-pods:

          - meep-cert-manager
@@ -243,6 +255,7 @@ repo: 
          - meep-rnis

          - meep-wais

          - meep-sandbox-ctrl

          - meep-app-enablement

          # - meep-tc-engine

      meep-platform-ctrl:

        # location of source code
@@ -264,7 +277,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

        # AdvantEDGE resources included in Docker container image

        docker-data:

          # location of AdvantEDGE swagger files
@@ -304,6 +318,7 @@ repo: 
          meep-sandbox-ctrl: charts/meep-sandbox-ctrl

          meep-tc-engine: charts/meep-tc-engine

          meep-virt-chart-templates: charts/meep-virt-chart-templates

          meep-app-enablement: charts/meep-app-enablement

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine
@@ -313,6 +328,7 @@ repo: 
          - meep-rnis

          - meep-wais

          - meep-sandbox-ctrl

          - meep-app-enablement

          # - meep-tc-engine

      meep-webhook:

        # location of source code
@@ -401,6 +417,7 @@ repo: 
          - sandbox.go-apps.meep-wais

          - sandbox.go-apps.meep-metrics-engine

          - packages.go-packages.meep-metrics-engine-notification-client

          - sandbox.go-apps.meep-app-enablement

          # - sandbox.go-apps.meep-mg-manager

          # - packages.go-packages.meep-mg-app-client
@@ -431,7 +448,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

      meep-loc-serv:

        # location of source code

        src: go-apps/meep-loc-serv
@@ -455,7 +473,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

      meep-metrics-engine:

        # location of source code

        src: go-apps/meep-metrics-engine
@@ -479,7 +498,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

      meep-mg-manager:

        # location of source code

        src: go-apps/meep-mg-manager
@@ -500,7 +520,8 @@ repo: 
        # supports linting

        lint: false

        # location of API specification

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

        api:

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

      meep-rnis:

        # location of source code

        src: go-apps/meep-rnis
@@ -524,7 +545,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-rnis/api/swagger.yaml

        api:

          meep-rnis: go-apps/meep-rnis/api/swagger.yaml

      meep-wais:

        # location of source code

        src: go-apps/meep-wais
@@ -548,7 +570,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-wais/api/swagger.yaml

        api:

          meep-wais: go-apps/meep-wais/api/swagger.yaml

      meep-sandbox-ctrl:

        # location of source code

        src: go-apps/meep-sandbox-ctrl
@@ -569,7 +592,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

        docker-data:

          'entrypoint.sh': go-apps/meep-sandbox-ctrl/entrypoint.sh

          swagger: bin/meep-sandbox-swagger-ui
@@ -607,6 +631,33 @@ repo: 
        codecov: false

        # supports linting

        lint: false

      meep-app-enablement:

        # location of source code

        src: go-apps/meep-app-enablement

        # location of binary

        bin: bin/meep-app-enablement

        # location of deployment chart

        chart: charts/meep-app-enablement

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

        chart-user-values: meep-app-enablement.yaml

        # extra build flags

        build-flags:

          - -mod=vendor

        # enable meepctl build

        build: true

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: true

        # location of API specification

        api:

          meep-app-support: go-apps/meep-app-enablement/api/app-support/swagger.yaml

          meep-service-mgmt: go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml

          meep-app-info: go-apps/meep-app-enablement/api/app-info/swagger.yaml



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

  #  Dependencies
@@ -825,14 +876,16 @@ repo: 
        # supports linting

        lint: false

        # location of API specification

        api: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml

        api:

          meep-metrics-engine-notification-client: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml

      meep-mg-app-client:

        # location of source code

        src: go-packages/meep-mg-app-client

        # supports linting

        lint: false

        # location of API specification

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

        api:

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

      meep-mg-manager-client:

        # location of source code

        src: go-packages/meep-mg-manager-client

config/objstore-influx.cfg

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[default]

aws_access_key_id=my-access-key

aws_secret_access_key=my-secret-key

config/thanos.yaml→config/objstore-thanos.yaml

+0 −0

File moved.

View file