@leverege/build-tools 2.55.4 → 2.56.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.55.4",
+  "version": "2.56.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/registry-compass.yaml

@@ -0,0 +1,20 @@
+registry:
+  - root: us-docker.pkg.dev
+  - repositories:
+    - name: stack
+      charts:
+        - api-server
+        - authz-server
+        - emailer
+        - message-processor
+    - name: leverege
+      charts:
+        - pubsub-pulse
+        - pusher
+        - overdose
+    - name: cox-health
+      charts:
+        - actions-server
+        - analytics-server
+        - centrak-healthz
+        - centrak-ingestor

package/src/Utils.mjs

@@ -35,6 +35,14 @@ export const errorExit = ( error, opts = { errorCode : 1 } ) => {
 }
 /* eslint-enable no-console */
 
+export const isHex = ( hex ) => {
+  return hex instanceof Buffer || /^[0-9a-f]+$/i.test( hex )
+}
+
+export const isString = ( s ) => {
+  return typeof s === 'string' || s instanceof String
+}
+
 /**
  * General "yes" to proceed function.
  */

package/src/chart-compass.mjs

@@ -0,0 +1,96 @@
+#!/usr/bin/env node
+/*
+ * chart-to-registry will...
+ */
+import fs from 'node:fs'
+
+import chalk from 'chalk'
+import commandLineArgs from 'command-line-args'
+import commandLineUsage from 'command-line-usage'
+import { lt as semverLt } from 'semver'
+import YAML from 'js-yaml'
+
+import {
+  condir,
+  debug,
+  errorExit,
+  log,
+  warning,
+  getGitRootDirectory,
+  parsePackageJson,
+  parseHelmChart,
+  shellCmd } from './Utils.mjs'
+
+const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
+  /* eslint-disable max-len */
+  {
+    name : 'location',
+    type : String,
+    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
+  },
+  {
+    name : 'project',
+    type : String,
+    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
+  },
+  {
+    name : 'repository',
+    type : String,
+    description : '{green the target repository to receive the pushed chart}',
+  },
+  {
+    name : 'dry-run',
+    type : Boolean,
+    description : '{yellow perform everything except the actual chart push}',
+  },
+  {
+    name : 'help',
+    type : Boolean,
+    description : '{green display this help screen}',
+  },
+  /* eslint-enable max-len */
+]
+
+const sections = [
+  {
+    header : 'Leverege Helm Chart Compass (for helmup)',
+    content : `{green This tool helps helmup navigate the helm charts stored in the
+artifact-registries.}`
+  },
+  { header : 'Options',
+    optionList : commandLineOptions,
+  },
+]
+
+const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
+const usage = commandLineUsage( sections )
+
+if ( args.help ) {
+  log( usage )
+  process.exit( 0 )
+}
+
+/* eslint-disable no-underscore-dangle */
+if ( args._unknown ) {
+  log( usage )
+  log( `\nUnrecognized argument [${chalk.bold.red( args._unknown )}]\n` )
+  process.exit( 1 )
+}
+/* eslint-enable no-underscore-dangle */
+
+const minNodejsVersion = '18.0.0'
+if ( semverLt( process.version, minNodejsVersion ) ) {
+  errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
+}
+
+// First of all, fail if we are not in a git repository
+let gitRoot
+try {
+  gitRoot = await getGitRootDirectory()
+} catch ( error ) {
+  errorExit( chalk.red.bold( error ), { errorCode : 5 } )
+}
+
+const chartCompass = YAML.load( fs.readFileSync( './registry-compass.yaml', 'utf8' ) )
+
+condir( { chartCompass }, '<==Navigation' )

package/src/helm-charts/elasticsearch8/helmup.plugin

@@ -2,7 +2,7 @@
 #
 showInstalling "Elastic Search 8"
 
-[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.3.20"
+[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.3.22"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/elasticsearch"
 
@@ -14,6 +14,3 @@ helm upgrade --install elasticsearch8 $OCI_CHART \
              --namespace elastic --create-namespace \
              --values $LOCAL_ES_VALUES \
              --version $ELASTIC_CHART_VERSION $HELM_WHAT
-
-## Installing ES8 exporter into monitoring namespace
-installElasticsearchExporter

package/src/helm-charts/prom-operator/prometheus-stack.yaml.ovh

@@ -68,7 +68,7 @@ grafana:
         entryPoints:
           - websecure
         routes:
-          - match: Host(`OVH:<PROJECT_NAME>-monitoring.OVH:<HOST>.com`)
+          - match: Host(`OVH:<PROJECT_NAME>-promop.OVH:<HOST>.com`)
             kind: Rule
             services:
             - name: prometheus-stack-grafana
@@ -111,6 +111,20 @@ alertmanager:
                 *Description:* {{ .Annotations.description }}
                 *Dashboard:* {{ .Annotations.dashboard }}
               {{ end }}
+      - name: slack-watchdog
+        slack_configs:
+          - channel: "#dead-mans-snitch_notifications"
+            api_url: "OVH:<SLACK_HOOK_URL>"
+            username: "OVH:<PROJECT_NAME>"
+            fallback: "OVH:<PROJECT_NAME> - {{ .CommonAnnotations.summary }}"
+            title: "Watchdog Alert - Dead Man's Snitch"
+            # text: "This is a periodic test alert to confirm the alert pipeline is functional."
+            text: |-
+              {{ range .Alerts }}
+                *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}`
+                *Description:* {{ .Annotations.description }}
+                *Dashboard:* {{ .Annotations.dashboard }}
+              {{ end }}
       - name: opsgenie
         opsgenie_configs:
           - api_key: "OVH:<OPSGENIE_APIKEY>"
@@ -131,6 +145,9 @@ alertmanager:
         - cluster
       receiver: slack
       routes:
+      - match:
+          alertname: "Watchdog"
+        receiver: slack-watchdog
       - match:
           severity: page
         receiver: opsgenie

package/src/helm-charts/traefik/traefik-local.yaml

@@ -24,6 +24,13 @@ resources:
     cpu: "100m"
     memory: "50Mi"
 
+metrics:
+  prometheus:
+    serviceMonitor:
+      enabled: false
+      interval: 30s
+      namespace: prometheus
+
 # Custom entry points may be added here - the first two are port definitions
 # for both unsecured and secured MQTT ports used by connect. Note that the
 # mqtts port has TLS termination performed by traefik and both ports are then

package/src/helmup.sh

@@ -238,7 +238,7 @@ MISSING_HELMUP_PLUGIN
 
   cp -a $SERVICE_CHART .
   # because npm tends to not allow .gitinore files the easy way...
-  [ -f "$SERVICE/gitignore" ] && mv $SERVICE/gitignore $SERVICE/.gitignore
+  find $SERVICE -type f -name "gitignore" -execdir mv {} .gitignore \;
   git add $SERVICE
   overwhelm --genvals
   ifPluggedIn $SERVICE

package/src/overwhelm.mjs

@@ -15,7 +15,7 @@ import parse from 'parse-gitignore'
 import ask from 'readline-sync'
 import YAML from 'js-yaml'
 
-import { debug, disableDebug, err, log, shellCmd } from './Utils.mjs'
+import { debug, disableDebug, err, errorExit, isString, log, shellCmd } from './Utils.mjs'
 
 const optionsDefinitions = [
   /* eslint-disable no-multi-spaces */
@@ -264,6 +264,26 @@ const opt = {
 
 const ahoy = glob.sync( '*/', opt )
 
+// Verifies that all values in a config block are quoted
+const validValuesLocalConfig = ( vlf ) => {
+  if ( ! fs.existsSync( vlf ) ) { return undefined }
+
+  const valuesLocal = YAML.load( fs.readFileSync( vlf, { encoding : 'utf-8' } ) )
+  const configBlock = valuesLocal.config
+
+  // only care about validating config at this time
+  if ( configBlock ) {
+    for ( const [ key, value ] of Object.entries( configBlock ) ) {
+      if( ! isString( value ) ) {
+        err( { configBlock }, '***Bad config block' )
+        errorExit( `Is ${key} missing quotes around ${value} in ${vlf}?` )
+      }
+    }
+  }
+
+  return true // TODO: return the already read valuesLocal info?
+}
+
 // .nohelm = skips generation of values.yaml but allows helmup to run
 ahoy.forEach( ( dir ) => {
   if ( !fs.existsSync( `${dir}/.nohelm` ) ) {
@@ -274,7 +294,7 @@ ahoy.forEach( ( dir ) => {
     // Add support for localized values for things like keel (or whatever)
     const valuesLocal = `${dir}/values-local.yaml`
 
-    if ( fs.existsSync( valuesLocal ) ) {
+    if ( validValuesLocalConfig( valuesLocal ) ) {
       debug( { valuesLocal }, 'rendering values.yaml' )
       valuesOut += '\n# OVERWHELM => values-local.yaml\n\n'
       valuesOut += fs.readFileSync( valuesLocal, { encoding : 'utf-8' } )