WIFI-1812: Change the front-end image tags

* add exporting of servo beans
* add changelog entry

.github/workflows/helm-build.yml

@@ -3,60 +3,28 @@ name: Helm CI - TIP WLAN Cloud Master
 on: 
   push:
     branches: [ master ]
-    tags: [ "v*" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          ssh-key: ${{ secrets.GH_AUTOMATION_KEY }}
+          submodules: true
+      - name: Login to TIP Docker registry 
+        uses: azure/docker-login@v1
+        with:
+          login-server: tip-tip-wlan-cloud-docker-repo.jfrog.io
+          username: build-pipeline
+          password: ${{ secrets.DOCKER_REPO_PASSWORD }}
       - name: Login to TIP Helm chart registry
         run: helm repo add tip-wlan-cloud-helm-virtual-repo https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-virtual-repo --username build-pipeline --password ${{ secrets.HELM_REPO_PASSWORD }}
       - name: Build tip-wlan chart file
-        run: |
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            PACKAGE_OPTS="--version ${GITHUB_REF#refs/tags/v}"
-          else
-            PACKAGE_OPTS=""
-          fi
-          helm package $PACKAGE_OPTS -u tip-wlan
-      - name: Store chart as artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: helm-chart
-          path: tip-wlan-*.tgz
+        run: tar -czf tip-wlan.tgz tip-wlan
       - name: Upload tip-wlan chart to the TIP helm registry
+        run: curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan.tgz"
+      - name: Verify that chart was uploaded successfully
         run: |
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan-${GITHUB_REF#refs/tags/v}.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan-${GITHUB_REF#refs/tags/v}.tgz"
-          else
-            curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan-*.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan-master.tgz"
-          fi
-
-  release:
-    runs-on: ubuntu-latest
-    needs: [ build ]
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v2
-      - name: setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.8"
-      - name: install keepachangelog
-        run: pip install keepachangelog
-      - name: create release description
-        continue-on-error: true
-        run: python .github/workflows/prepare-release-description.py ${GITHUB_REF#refs/tags/v} > RELEASE.md
-      - name: download Helm chart artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: helm-chart
-      - name: create release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: tip-wlan-*.tgz
-          body_path: RELEASE.md
-          prerelease: ${{ contains(github.ref, 'rc') }}
+          helm repo update
+          helm search repo tip

.github/workflows/prepare-release-description.py

@@ -1,24 +0,0 @@
-import sys
-
-import keepachangelog
-
-CATEGORIES = ['added', 'changed', 'deprecated', 'removed', 'fixed', 'security']
-
-version = sys.argv[1]
-
-try:
-    changes = keepachangelog.to_dict("CHANGELOG.md")[version]
-except KeyError:
-    print(f'No changelog entry for version {version}', file=sys.stderr)
-    exit(1)
-
-
-print('## Changelog')
-for category in CATEGORIES:
-    entries = changes.get(category, [])
-
-    if entries:
-        print(f'### {category.capitalize()}') 
-
-    for entry in entries:
-        print(f'- {entry}') 

CHANGELOG.md

@@ -5,43 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.1] - 2021-04-12
-
-### Changed
-
-- bump cloud controller version to 1.0.1
-
-### Fixed
-
-- correct SQL and CQL schema URLs
-
-## [1.0.0] - 2021-04-01
+## [Unreleased](xxx)
 
 ### Added
 
-- replaced cassandra, postgres and kafka with upstream charts [#49](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/49)
-- centralized secrets to the parent chart [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
+- Replaced cassandra, postgres and kafka with upstream charts [#49](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/49)
+- Centralized secrets to the parent chart [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
+- Export servo MBeans with JMX Prometheus exporter [#65](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/65)
 
 ### Changed
 
-- improved kafka setup templating [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
-- improved values.yaml [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
-- improved default values and added yaml anchors [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
+- Improved kafka setup templating [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
+- Improved values.yaml [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
+- Improved default values and added yaml anchors [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
 
 ### Removed
 
-- removed hardcoded docker secret in favor of variables [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
-- various outdated sections in values.yaml and environment files
-- various secrets in subcharts as they are now part of the parent chart
+- Removed hardcoded docker secret in favor of variables [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
+- Various outdated sections in values.yaml and environment files
+- Various secrets in subcharts as they are now part of the parent chart
 - references to vendor specific values [#40](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/40)
 
-### Fixed
-
-- make SSC service able to reconnect to Cassandra [#70](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/70)
-
-## [0.4.0] - 2021-01-28
+## [0.4.0](https://github.com/Telecominfraproject/wlan-cloud-helm/compare/f7c67645736e3dac498e2caec8c267f04d08b7bc...v0.4) - 2021-01-28
 
 ### Added
 
-- initial changelog entry. This is the first versioned release. Next releases will include a detailed overview of all the major changes introduced since the last version.
-- [changes since first commit](https://github.com/Telecominfraproject/wlan-cloud-helm/compare/f7c67645736e3dac498e2caec8c267f04d08b7bc...v0.4)
+- Initial changelog entry. This is the first versioned release. Next releases will include a detailed overview of all the major changes introduced since the last version.
+

tip-wlan/Chart.yaml

@@ -14,11 +14,11 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.0.1
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.0.1
+appVersion: 1.16.0
 
 home: https://telecominfraproject.com/wifi/
 sources:

tip-wlan/charts/common/Chart.yaml

@@ -7,5 +7,5 @@ version: 0.1.0
 
 dependencies:
   - name: efs-provisioner
-    version: 1.0.1
+    version: 1.0.0
     condition: efs-provisioner.enabled

tip-wlan/charts/common/charts/efs-provisioner/Chart.yaml

@@ -4,4 +4,4 @@
 apiVersion: v1
 description: EFS-Provisioner Chart to be used by other charts for file storage
 name: efs-provisioner
-version: 1.0.1
+version: 1.0.0

tip-wlan/charts/opensync-gw-cloud/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: opensync-gateway-cloud
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/charts/opensync-gw-static/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: opensync-gateway-static
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/charts/wlan-cloud-graphql-gw/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-cloud-graphql-gw
-  tag: 1.0.1
+  tag: latest
   pullPolicy: IfNotPresent
 
 nameOverride: ""

tip-wlan/charts/wlan-cloud-static-portal/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-cloud-ui
-  tag: 1.0.1
+  tag: latest
   pullPolicy: IfNotPresent
 
 nameOverride: ""

tip-wlan/charts/wlan-integrated-cloud-component-service/templates/deployment.yaml

@@ -58,7 +58,7 @@ spec:
           apt update
           apt -y install curl
           echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****"
-          curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.1/sql/cloud-sdk-schema-postgresql.sql"
+          curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
           echo "***** Now executing cloud-sdk-schema-postgresql.sql and creating/updating schema on Postgres instance *****"
           PGPASSWORD=$POSTGRES_PASSWORD psql -h {{- include "postgresql.service" . -}} -U postgres -f cloud-sdk-schema-postgresql.sql
           exit

tip-wlan/charts/wlan-integrated-cloud-component-service/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-integrated-cloud-component-service
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""
@@ -111,4 +111,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}

tip-wlan/charts/wlan-port-forwarding-gateway-service/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-port-forwarding-gateway-service
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/charts/wlan-portal-service/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-portal-service
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""
@@ -155,4 +155,4 @@ filestore:
   internal: "/tmp/filestore"
 
 tlsv13:
-  enabled: true
+  enabled: true

tip-wlan/charts/wlan-prov-service/templates/deployment.yaml

@@ -62,8 +62,8 @@ spec:
             apt update
             apt -y install curl
             echo "***** Fetching latest cloud-sdk-schema-postgresql for DB and Tables sql from JFrog *****"
-            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.1/sql/cloud-sdk-schema-postgresql-db-user.sql"
-            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.1/sql/cloud-sdk-schema-postgresql-tables.sql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql-db-user.sql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql-tables.sql"
             echo "***** Now executing cloud-sdk-schema-postgresql-db-user.sql on host {{ $pg }} and creating db prov_db and user tip_user using User Postgres. This uses full client-cert authentication *****"
             ### Observed that PSQL was unable to resolve the Postgres-service host because the postgres service wasnt
             ### really ready when running Postgres in Master-Slave config... hence the below retry-logic

tip-wlan/charts/wlan-prov-service/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-prov-service
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/charts/wlan-spc-service/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-spc-service
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/charts/wlan-ssc-service/templates/configmap.yaml

@@ -11,10 +11,8 @@ data:
             contact-points = [ "{{ include "cassandra.service" . }}:9042" ]
             load-balancing-policy.local-datacenter = datacenter1
             session-keyspace = tip_wlan_keyspace
-            request.consistency = LOCAL_QUORUM
         }
 
-        advanced.resolve-contact-points = false
         advanced.ssl-engine-factory {
             class = DefaultSslEngineFactory
             hostname-validation = false

tip-wlan/charts/wlan-ssc-service/templates/deployment.yaml

@@ -54,7 +54,7 @@ spec:
             apt update
             apt -y install curl
             echo "***** Fetching cloud-sdk-schema-cassandra.cql from JFrog *****"
-            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.1/cql/cloud-sdk-schema-cassandra.cql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/cql/cloud-sdk-schema-cassandra.cql"
             echo "***** Now executing cloud-sdk-schema-cassandra.cql and creating/updating schema on Cassandra instance *****"
             counter=0
             status=1

tip-wlan/charts/wlan-ssc-service/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-ssc-service
-  tag: 1.0.1
+  tag: 0.0.1-SNAPSHOT
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/resources/configs/jmx-prometheus-config.yml

@@ -1,13 +1,15 @@
 lowercaseOutputLabelNames: true
 lowercaseOutputName: true
-whitelistObjectNames: ["java.lang:type=OperatingSystem"]
+whitelistObjectNames:
+  - "java.lang:type=OperatingSystem"
+  - "com.netflix.servo:name=cassandra*,type=COUNTER"
+  - "com.netflix.servo:name=cassandra*,type=GAUGE"
+  - "com.netflix.servo:name=singleDataSource*,type=GAUGE"
+  - "com.netflix.servo:name=singleDataSource*,type=COUNTER"
+  - "com.netflix.servo:name=jdbc*,type=GAUGE"
+  - "com.netflix.servo:name=jdbc*,type=COUNTER"
+  - "com.netflix.servo:name=kafka*,type=GAUGE"
+  - "com.netflix.servo:name=kafka*,type=COUNTER"
+  - "com.netflix.servo:name=osgw*,type=GAUGE"
+  - "com.netflix.servo:name=osgw*,type=COUNTER"
 blacklistObjectNames: []
-rules:
-  - pattern: 'java.lang<type=OperatingSystem><>(committed_virtual_memory|free_physical_memory|free_swap_space|total_physical_memory|total_swap_space)_size:'
-    name: os_$1_bytes
-    type: GAUGE
-    attrNameSnakeCase: true
-  - pattern: 'java.lang<type=OperatingSystem><>((?!process_cpu_time)\w+):'
-    name: os_$1
-    type: GAUGE
-    attrNameSnakeCase: true

tip-wlan/values.yaml

@@ -130,12 +130,6 @@ kafka:
     - name: customer_events
       partitions: 1
       replicationFactor: 1
-    - name: location_metrics
-      partitions: 1
-      replicationFactor: 1
-    - name: location_events
-      partitions: 1
-      replicationFactor: 1
   creds:
     sslKeyPassword: *sslKeyPassword
     sslKeystorePassword: *sslKeystorePassword