Commit 03d61336 authored by Michel Roy's avatar Michel Roy
Browse files

Merge branch 'develop' into mike-omt

parents ac3e4651 ed8b0ecf
Loading
Loading
Loading
Loading
+223 −189
Original line number Diff line number Diff line
@@ -12,71 +12,100 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: 1.4.1
version: 1.4.2
repo:
  name: AdvantEDGE

  #------------------------------
  #  Core Subsystem
  #------------------------------
  core:
    meep-user:
      service-account: charts/meep-user/meep-user-serviceaccount.yaml
      cluster-role-binding: charts/meep-user/meep-user-clusterrolebinding.yaml

    # Go Applications
    go-apps:
      meep-mon-engine:
        src: go-apps/meep-mon-engine
        bin: bin/meep-mon-engine
        chart: charts/meep-mon-engine
        build-flags:
          - -mod=vendor
        codecov: true
        lint: true
      meep-platform-ctrl:
        src: go-apps/meep-platform-ctrl
        bin: bin/meep-platform-ctrl
        chart: charts/meep-platform-ctrl
        codecov: true
        lint: true
        api: go-apps/meep-platform-ctrl/api/swagger.yaml
        docker-data:
          api: bin/meep-swagger-ui
          static: bin/meep-frontend
      meep-virt-engine:
        src: go-apps/meep-virt-engine
        bin: bin/meep-virt-engine
        chart: charts/meep-virt-engine
        codecov: true
        lint: true
        docker-data:
          'entrypoint.sh': go-apps/meep-virt-engine/entrypoint.sh
          meep-loc-serv: charts/meep-loc-serv
          meep-metrics-engine: charts/meep-metrics-engine
          meep-mg-manager: charts/meep-mg-manager
          meep-rnis: charts/meep-rnis
          meep-sandbox-ctrl: charts/meep-sandbox-ctrl
          meep-tc-engine: charts/meep-tc-engine
          meep-virt-chart-templates: charts/meep-virt-chart-templates
      meep-webhook:
        src: go-apps/meep-webhook
        bin: bin/meep-webhook
        chart: charts/meep-webhook
        build-flags:
          - -mod=vendor
        codecov: false
      lint: false
        lint: true

    # CORE APPS (JS)
    # Javascript Applications
    js-apps:
      meep-frontend:
        src: js-apps/meep-frontend
        bin: bin/meep-frontend
      codecov: false
        lint: true
        local-deps:
        meep-ctrl-engine-api: js-packages/meep-ctrl-engine-client
          meep-platform-ctrl-api: js-packages/meep-platform-ctrl-client
          meep-sandbox-ctrl-api: js-packages/meep-sandbox-ctrl-client
          meep-mon-engine-api: js-packages/meep-mon-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-metrics-engine-notification-client
        - meep-mg-manager
        - meep-mg-app-client
        - meep-rnis
        - meep-rnis-notification-client
        - meep-loc-serv
        - meep-loc-serv-notification-client
          - core.go-apps.meep-platform-ctrl
          - sandbox.go-apps.meep-sandbox-ctrl
          - sandbox.go-apps.meep-loc-serv
          - packages.go-packages.meep-loc-serv-notification-client
          - sandbox.go-apps.meep-rnis
          - packages.go-packages.meep-rnis-notification-client
          - sandbox.go-apps.meep-metrics-engine
          - packages.go-packages.meep-metrics-engine-notification-client
          - sandbox.go-apps.meep-mg-manager
          - packages.go-packages.meep-mg-app-client

    # CORE APPS (GO)
    meep-ctrl-engine:
      src: go-apps/meep-ctrl-engine
      bin: bin/meep-ctrl-engine
      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-rnis:
      src: go-apps/meep-rnis
      bin: bin/meep-rnis
      chart: charts/meep-rnis
      build-flags:
        - -mod=vendor
      codecov: true
      lint: true
      nodeport: 30017
      api: go-apps/meep-rnis/api/swagger.yaml
  #------------------------------
  #  Sandbox Subsystem
  #------------------------------
  sandbox:

    # Go Applications
    go-apps:
      meep-loc-serv:
        src: go-apps/meep-loc-serv
        bin: bin/meep-loc-serv
        chart: charts/meep-loc-serv
        build-flags:
          - -mod=vendor
      codecov: true
        codecov: false
        lint: true
      nodeport: 30007
        api: go-apps/meep-loc-serv/api/swagger.yaml
      meep-metrics-engine:
        src: go-apps/meep-metrics-engine
@@ -84,78 +113,76 @@ repo:
        chart: charts/meep-metrics-engine
        build-flags:
          - -mod=vendor
      codecov: true
        codecov: false
        lint: true
      nodeport: 30008
        api: go-apps/meep-metrics-engine/api/v2/swagger.yaml
      meep-mg-manager:
        src: go-apps/meep-mg-manager
        bin: bin/meep-mg-manager
        chart: charts/meep-mg-manager
      codecov: true
        codecov: false
        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
      chart: charts/meep-mon-engine
      meep-rnis:
        src: go-apps/meep-rnis
        bin: bin/meep-rnis
        chart: charts/meep-rnis
        build-flags:
          - -mod=vendor
      codecov: true
        codecov: false
        lint: true
        api: go-apps/meep-rnis/api/swagger.yaml
      meep-sandbox-ctrl:
        src: go-apps/meep-sandbox-ctrl
        bin: bin/meep-sandbox-ctrl
        chart: charts/meep-sandbox-ctrl
        codecov: false
        lint: true
        api: go-apps/meep-sandbox-ctrl/api/swagger.yaml
      meep-tc-engine:
        src: go-apps/meep-tc-engine
        bin: bin/meep-tc-engine
        chart: charts/meep-tc-engine
      codecov: true
        codecov: false
        lint: true
      meep-tc-sidecar:
        src: go-apps/meep-tc-sidecar
        bin: bin/meep-tc-sidecar
        codecov: false
        lint: true
    meep-virt-engine:
      src: go-apps/meep-virt-engine
      bin: bin/meep-virt-engine
      chart: charts/meep-virt-engine
      template: charts/meep-virt-engine/virt-templates
      codecov: true
      lint: true
    meep-webhook:
      src: go-apps/meep-webhook
      bin: bin/meep-webhook
      chart: charts/meep-webhook
      build-flags:
        - -mod=vendor
      codecov: false
      lint: true

    # # CORE PACKAGES (JS)
    # meep-ctrl-engine-client:
    #   src: js-packages/meep-ctrl-engine-client
    #   lint: false
    # meep-metrics-engine-client:
    #   src: js-packages/meep-metrics-engine-client
    #   lint: false
  #------------------------------
  #  Dependencies
  #------------------------------
  dep:
    meep-couchdb:
      chart: charts/couchdb
    meep-docker-registry:
      chart: charts/docker-registry
    meep-grafana:
      chart: charts/grafana
    meep-influxdb:
      chart: charts/influxdb
    meep-kube-state-metrics:
      chart: charts/kube-state-metrics
    meep-ingress:
      chart: charts/nginx-ingress
    meep-redis:
      chart: charts/redis

  #------------------------------
  #  Packages
  #------------------------------
  packages:

    # CORE PACKAGES (GO)
    # Go Packages
    go-packages:
      meep-couch:
        src: go-packages/meep-couch
        lint: true
    meep-ctrl-engine-client:
      src: go-packages/meep-ctrl-engine-client
      lint: false
    meep-ctrl-engine-model:
      src: go-packages/meep-ctrl-engine-model
      meep-data-model:
        src: go-packages/meep-data-model
        lint: true
    meep-rnis-client:
      src: go-packages/meep-rnis-client
      lint: false
    meep-rnis-notification-client:
      src: go-packages/meep-rnis-notification-client
      lint: false
      api: go-packages/meep-rnis-notification-client/api/swagger.yaml
      meep-loc-serv-client:
        src: go-packages/meep-loc-serv-client
        lint: false
@@ -166,9 +193,6 @@ repo:
      meep-logger:
        src: go-packages/meep-logger
        lint: true
    meep-http-logger:
      src: go-packages/meep-http-logger
      lint: true
      meep-metric-store:
        src: go-packages/meep-metric-store
        lint: true
@@ -189,6 +213,9 @@ repo:
      meep-model:
        src: go-packages/meep-model
        lint: true
      meep-mq:
        src: go-packages/meep-mq
        lint: true
      meep-net-char-mgr:
        src: go-packages/meep-net-char-mgr
        lint: true
@@ -198,21 +225,28 @@ repo:
      meep-replay-manager:
        src: go-packages/meep-replay-manager
        lint: true
      meep-rnis-client:
        src: go-packages/meep-rnis-client
        lint: false
      meep-rnis-notification-client:
        src: go-packages/meep-rnis-notification-client
        lint: false
        api: go-packages/meep-rnis-notification-client/api/swagger.yaml
      meep-sandbox-ctrl-client:
        src: go-packages/meep-sandbox-ctrl-client
        lint: false
      meep-watchdog:
        src: go-packages/meep-watchdog
        lint: true
  dep:
    couchdb:
      chart: charts/couchdb
    docker-registry:
      chart: charts/docker-registry
    grafana:
      chart: charts/grafana
    influxdb:
      chart: charts/influxdb
    kube-state-metrics:
      chart: charts/kube-state-metrics
    nginx-ingress:
      chart: charts/nginx-ingress
    redis:
      chart: charts/redis

    # Javascript Packages
    js-packages:
      meep-mon-engine-client:
        src: js-packages/meep-mon-engine-client
        lint: false
      meep-platform-ctrl-client:
        src: js-packages/meep-platform-ctrl-client
        lint: false
      meep-sandbox-ctrl-client:
        src: js-packages/meep-sandbox-ctrl-client
        lint: false
+414 −0
Original line number Diff line number Diff line
{
  "editable": true,
  "gnetId": null,
  "graphTooltip": 0,
  "iteration": 1588086315506,
  "links": [],
  "panels": [
    {
      "cacheTimeout": null,
      "columns": [],
      "datasource": "$datasource",
      "fontSize": "100%",
      "gridPos": {
        "h": 2,
        "w": 24,
        "x": 0,
        "y": 1
      },
      "id": 5,
      "links": [],
      "options": {},
      "pageSize": null,
      "pluginVersion": "6.4.2",
      "showHeader": true,
      "sort": {
        "col": 0,
        "desc": true
      },
      "styles": [
        {
          "alias": "Time",
          "dateFormat": "YYYY-MM-DD HH:mm:ss",
          "pattern": "Time",
          "type": "date"
        },
        {
          "alias": "Type",
          "colorMode": null,
          "colors": [
            "#C4162A",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "dateFormat": "YYYY-MM-DD HH:mm:ss",
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.direction",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": [
            {
              "text": "Request",
              "value": "RX"
            },
            {
              "text": "Notification",
              "value": "TX"
            }
          ]
        },
        {
          "alias": "Id",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.id",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": []
        },
        {
          "alias": "Service",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.logger_name",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": []
        },
        {
          "alias": "Method",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.method",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": []
        },
        {
          "alias": "Endpoint with query parameterers",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.url",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": []
        },
        {
          "alias": "Response code",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.resp_code",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": []
        },
        {
          "alias": "Processing Time (us)",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
            "rgba(237, 129, 40, 0.89)",
            "rgba(50, 172, 45, 0.97)"
          ],
          "decimals": 2,
          "mappingType": 1,
          "pattern": "http.proc_time",
          "thresholds": [],
          "type": "string",
          "unit": "short",
          "valueMaps": []
        }
      ],
      "targets": [
        {
          "groupBy": [],
          "hide": false,
          "measurement": "http",
          "orderByTime": "ASC",
          "policy": "default",
          "query": "SELECT id,direction,logger_name,url,method,resp_code,proc_time FROM $database.autogen.http WHERE (\"logger_name\" =~ /^$logger_name$/) AND (\"id\"=$http_log_id)",
          "rawQuery": true,
          "refId": "A",
          "resultFormat": "time_series",
          "tags": []
        }
      ],
      "timeFrom": null,
      "timeShift": null,
      "title": "",
      "transform": "timeseries_to_columns",
      "type": "table"
    },
    {
      "content": "",
      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 3
      },
      "id": 30,
      "mode": "markdown",
      "options": {},
      "timeFrom": null,
      "timeShift": null,
      "title": "Request Body",
      "type": "text"
    },
    {
      "cacheTimeout": null,
      "datasource": "$datasource",
      "description": "",
      "gridPos": {
        "h": 5,
        "w": 24,
        "x": 0,
        "y": 4
      },
      "id": 31,
      "links": [],
      "options": {
        "showTime": false,
        "sortOrder": "Descending"
      },
      "pluginVersion": "6.5.2",
      "targets": [
        {
          "groupBy": [
            {
              "params": [
                "$__interval"
              ],
              "type": "time"
            },
            {
              "params": [
                "null"
              ],
              "type": "fill"
            }
          ],
          "measurement": "http",
          "orderByTime": "ASC",
          "policy": "default",
          "query": "SELECT body FROM $database.autogen.http WHERE (\"logger_name\" =~ /^$logger_name$/) AND (\"id\"=$http_log_id)",
          "rawQuery": true,
          "refId": "A",
          "resultFormat": "table"
        }
      ],
      "thresholds": "",
      "timeFrom": null,
      "timeShift": null,
      "title": "",
      "type": "logs"
    },
    {
      "content": "",
      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 9
      },
      "id": 32,
      "mode": "markdown",
      "options": {},
      "timeFrom": null,
      "timeShift": null,
      "title": "Response Body",
      "type": "text"
    },
    {
      "cacheTimeout": null,
      "datasource": "$datasource",
      "description": "",
      "gridPos": {
        "h": 5,
        "w": 24,
        "x": 0,
        "y": 10
      },
      "id": 33,
      "links": [],
      "options": {
        "showTime": false,
        "sortOrder": "Descending"
      },
      "pluginVersion": "6.5.2",
      "targets": [
        {
          "groupBy": [
            {
              "params": [
                "$__interval"
              ],
              "type": "time"
            },
            {
              "params": [
                "null"
              ],
              "type": "fill"
            }
          ],
          "measurement": "http",
          "orderByTime": "ASC",
          "policy": "default",
          "query": "SELECT resp_body FROM $database.autogen.http WHERE (\"logger_name\" =~ /^$logger_name$/) AND (\"id\"=$http_log_id)",
          "rawQuery": true,
          "refId": "A",
          "resultFormat": "table"
        }
      ],
      "thresholds": "",
      "timeFrom": null,
      "timeShift": null,
      "title": "",
      "type": "logs"
    }
  ],
  "refresh": "",
  "schemaVersion": 21,
  "style": "dark",
  "tags": [],
  "templating": {
    "list": [
      {
        "current": {
          "text": "meep-influxdb",
          "value": "meep-influxdb"
        },
        "hide": 0,
        "includeAll": false,
        "label": "",
        "multi": false,
        "name": "datasource",
        "options": [],
        "query": "influxdb",
        "refresh": 1,
        "regex": "",
        "skipUrlSync": false,
        "type": "datasource"
      },
      {
        "allValue": null,
        "current": {
          "text": "demo1",
          "value": "demo1"
        },
        "datasource": "$datasource",
        "definition": "show databases",
        "hide": 0,
        "includeAll": false,
        "label": null,
        "multi": false,
        "name": "database",
        "options": [],
        "query": "show databases",
        "refresh": 1,
        "regex": "",
        "skipUrlSync": false,
        "sort": 0,
        "tagValuesQuery": "",
        "tags": [],
        "tagsQuery": "",
        "type": "query",
        "useTags": false
      },
      {
        "allValue": "ALL",
        "current": {
          "text": "ALL",
          "value": "*"
        },
        "datasource": "$datasource",
        "definition": "show tag values on $database from http with key = \"logger_name\"",
        "hide": 0,
        "includeAll": false,
        "label": "service",
        "multi": false,
        "name": "logger_name",
        "options": [],
        "query": "show tag values on $database from http with key = \"logger_name\"",
        "refresh": 1,
        "regex": "",
        "skipUrlSync": false,
        "sort": 0,
        "tagValuesQuery": "",
        "tags": [],
        "tagsQuery": "",
        "type": "query",
        "useTags": false
      },
      {
        "allValue": "ALL",
        "current": {
          "text": "ALL",
          "value": "*"
        },
        "datasource": "$datasource",
        "definition": "show http log id selected",
        "hide": 0,
        "includeAll": false,
        "label": "http log Id",
        "multi": false,
        "name": "http_log_id",
        "options": [],
        "query": "SELECT id FROM $database.autogen.http WHERE (\"logger_name\" =~ /^$logger_name$/) ORDER BY time desc LIMIT 100",
        "refresh": 1,
        "regex": "",
        "skipUrlSync": false,
        "sort": 0,
        "tagValuesQuery": "",
        "tags": [],
        "tagsQuery": "",
        "type": "query",
        "useTags": false
      }
    ]
  },
  "timezone": "",
  "title": "Http REST API single log details",
  "uid": "4",
  "version": 1
}
+267 −0

File added.

Preview size limit exceeded, changes collapsed.

+6 −0
Original line number Diff line number Diff line
@@ -378,6 +378,12 @@ dashboards:
      file: dashboards/network-metrics-point-to-point.json
    network-metrics-aggregation:
      file: dashboards/network-metrics-aggregation.json
    http-single-log:
      file: dashboards/http-log-byId.json
    http-logs-aggregation:
      file: dashboards/http-loggers.json


  #   some-dashboard:
  #     json: |
  #       $RAW_JSON
+3 −2
Original line number Diff line number Diff line
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
  name: "{{ .Values.serviceAccount }}-{{ .Values.namespace }}"
  name: "{{ .Release.Namespace }}:{{ .Values.serviceAccount }}"
roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
@@ -9,4 +9,5 @@ roleRef:
subjects:
- kind: ServiceAccount
  name: {{ .Values.serviceAccount }}
  namespace: {{ .Values.namespace }}
 No newline at end of file
  namespace: {{ .Release.Namespace }}
  
 No newline at end of file
Loading