@leverege/build-tools 2.57.3 → 2.58.0-pedro.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.57.3",
+  "version": "2.58.0-pedro.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -48,6 +48,7 @@
     "pkglint": "src/pkglint.sh",
     "prune-git": "src/prune-git.sh",
     "pull-git": "src/pull-git.sh",
+    "push-model-to-registry": "src/push-model-to-registry.mjs",
     "push-my-chart": "src/push-my-chart.mjs",
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "refresh-py-idx": "src/refresh-py-idx.sh",
@@ -59,6 +60,7 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@google-cloud/artifact-registry": "^3.5.0",
+    "@google-cloud/storage": "^7.14.0",
     "ansi-colors": "^4.1.3",
     "chalk": "^5.3.0",
     "command-line-args": "^6.0.1",
@@ -66,6 +68,7 @@
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^9.5.1",
+    "fast-crc32c": "^2.0.0",
     "glob": "^11.0.0",
     "handlebars": "^4.7.8",
     "inquirer": "^12.1.0",
@@ -78,10 +81,10 @@
     "readline-sync": "^1.4.10",
     "semver": "^7.6.3",
     "simple-git": "^3.27.0",
-    "zx": "^8.2.2"
+    "zx": "^8.2.4"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^10.9.0"
+    "npm": "^10.9.1"
   }
-}
+}

package/src/Docker.mjs

@@ -23,6 +23,7 @@ const dockerfileTemplate = `
 # The FROM directive sets the Base Image for subsequent instructions
 FROM node:{{nodeimage}} as intermediate
 ENV NODE_ENV production
+ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -36,7 +37,7 @@ ENV GRPC_VERBOSITY ERROR
 # --------------------------------------------------------------
 
 # Install packages to install private repos with ssh keys
-COPY ./.npmrc /usr/src/app/.npmrc
+COPY ./.npmrc \${NPM_CONFIG_USERCONFIG}
 RUN apk --no-cache add openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make {{apkadds}} && \
@@ -44,16 +45,22 @@ RUN apk --no-cache add openssh-client && \
 
 {{preInstallPluginfile}}
 
-# Removed --ignore-scripts from npm ci because it was causing issues with python native build
+# Use SKIP_PREPARE to disable hook-and-release from running
 ENV SKIP_PREPARE=true
+
+# Do the clean install and remove the npm token and ssh keys from the image
 RUN npm ci --only=production --no-optional {{npmlogging}} && \
-    rm -f /usr/src/app/.npmrc /root/.ssh/*
+    rm -f \${NPM_CONFIG_USERCONFIG} /root/.ssh/*
 
 # --------------------------------------------------------------
-# On to the real build now, the thing before was just an intermediate container
+# Docker Final Stage
 # --------------------------------------------------------------
 
 FROM node:{{nodeimage}}
+ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
+
+# Copy .npmrc for private registry access for access to any @leverege packages
+COPY ./.npmrc \${NPM_CONFIG_USERCONFIG}
 
 # Install tini for PID 1 and replace shell with bash so we can source files
 RUN apk update && \
@@ -63,8 +70,12 @@ RUN apk update && \
     mkdir -p /usr/src/app /tmp/levlog && \
     chown node:node /usr/src/app
 
+# Pull in the Dockerfile.plugin file here
 {{pluginfile}}
 
+# Eliminate the sensitive info from the final stage image
+RUN rm -f \${NPM_CONFIG_USERCONFIG}
+
 ENTRYPOINT [ "/sbin/tini", "--" ]
 WORKDIR /usr/src/app
 

package/src/circleate.sh

@@ -11,6 +11,7 @@ fi
 
 repo_type=$1
 CIRCLE_NODE_IMG="cimg/node:lts"
+DOC_CREATOR_ENDPOINT="https://doc-creator.leverege.com/buildDocs/$(basename $npm_package_name)"
 
 check_circle_config(){
   if [ -d "./.circleci" ];
@@ -87,7 +88,7 @@ jobs:
           at: ~/project
       - run:
           name: Check for vulnerabilities
-          command: npm audit --production --audit-level=moderate
+          command: npm audit --omit=dev --audit-level=moderate
 
   license-check:
     docker:
@@ -131,6 +132,9 @@ jobs:
       - store_artifacts:
           path: docs
           prefix: docs
+      - run:
+          name: Initiate document creation
+          command: curl -X GET "$DOC_CREATOR_ENDPOINT"
 
   coverage:
     # coverage runs tests, generates coverage, and saves docs
@@ -303,7 +307,7 @@ jobs:
           at: ~/project
       - run:
           name: Check for vulnerabilities
-          command: npm audit --production --audit-level=moderate
+          command: npm audit --omit=dev --audit-level=moderate
 
   license-check:
     docker:
@@ -347,6 +351,9 @@ jobs:
       - store_artifacts:
           path: docs
           prefix: docs
+      - run:
+          name: Initiate document creation
+          command: curl -X GET "$DOC_CREATOR_ENDPOINT"
 
   coverage:
     # coverage runs tests, generates coverage, and saves docs

package/src/helm-charts/api-server/values-local.yaml

@@ -5,7 +5,7 @@
 #     - node tools/UpdateESMappingV2.js
 #
 image:
-  tag: # v5.16.0
+  tag: # v5.17.5
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/authz-server/values-local.yaml

@@ -4,7 +4,7 @@
 #     - npm run sequelizeRunMigrations
 #
 image:
-  tag: # v2.2.0
+  tag: # v2.4.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/db-curator/values-local.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: # v4.3.0
+  tag: # v4.4.2
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/emailer/values-local.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: # v3.5.1
+  tag: # v3.7.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/fota-server/values-local.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: # v1.2.2
+  tag: # v2.1.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
@@ -9,3 +9,6 @@ config:
 
   # CNPG override
 # SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+
+serviceMonitor:
+  enabled: false

package/src/helm-charts/message-processor/values-local.yaml

@@ -1,5 +1,8 @@
 image:
-  tag: # v4.0.0
+  tag: # v4.2.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
+
+serviceMonitor:
+  enabled: false

package/src/helm-charts/messenger/values-local.yaml

@@ -1,5 +1,5 @@
 image:
- tag: # v2.11.1
+ tag: # v2.14.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/prom-operator/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="65"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="66"
 
 NS="--namespace prometheus"
 

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

@@ -33,6 +33,8 @@ defaultRules:
 
 prometheus:
   prometheusSpec:
+#   image:
+#     tag: "v3.0.0"
     podMonitorSelectorNilUsesHelmValues: false
     ruleSelectorNilUsesHelmValues: false
     serviceMonitorSelectorNilUsesHelmValues: false
@@ -55,6 +57,11 @@ grafana:
   # -- the grafana admin password
   adminPassword: leverege-monitoring
   defaultDashboardsEnabled: false
+  persistence:
+    enabled: true
+    size: 10Gi
+    accessModes:
+      - ReadWriteOnce
   sidecar:
       dashboards:
         enabled: true
@@ -68,7 +75,7 @@ grafana:
         entryPoints:
           - websecure
         routes:
-          - match: Host(`OVH:<PROJECT_NAME>-promop.OVH:<HOST>.com`)
+          - match: Host(`${PROJECT_NAME}-promop.${HOST}.com`)
             kind: Rule
             services:
             - name: prometheus-stack-grafana
@@ -98,10 +105,10 @@ alertmanager:
     receivers:
       - name: slack
         slack_configs:
-          - channel: "OVH:<SLACK_CHANNEL>"
-            api_url: "OVH:<SLACK_HOOK_URL>"
-            username: "OVH:<PROJECT_NAME>"
-            fallback: "OVH:<PROJECT_NAME> - {{ .CommonAnnotations.summary }}"
+          - channel: "${SLACK_CHANNEL}"
+            api_url: "${SLACK_HOOK_URL}"
+            username: "${PROJECT_NAME}"
+            fallback: "${PROJECT_NAME} - {{ .CommonAnnotations.summary }}"
             title: "{{ range .Alerts }}{{ .Annotations.summary }}\n{{ end }}"
             title_link: "https://bitbucket.org/leverege/sre-playbook/src/master/"
             send_resolved: true
@@ -114,9 +121,9 @@ alertmanager:
       - 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 }}"
+            api_url: "${SLACK_HOOK_URL}"
+            username: "${PROJECT_NAME}"
+            fallback: "${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: |-
@@ -127,7 +134,7 @@ alertmanager:
               {{ end }}
       - name: opsgenie
         opsgenie_configs:
-          - api_key: "OVH:<OPSGENIE_APIKEY>"
+          - api_key: "${OPSGENIE_APIKEY}"
             priority: "{{ .CommonLabels.priority }}"
             tags: "{{ range .Alerts }}{{ .Labels.severity }},{{ end }}"
             description: |-

package/src/helm-charts/prom-operator/rules/cnpg-rules.yaml

@@ -0,0 +1,125 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: cnpg-default-alerts
+spec:
+  groups:
+  - name: cnpg-default.rules
+    rules:
+    - alert: LongRunningTransaction
+      annotations:
+        description: Pod {{ $labels.pod }} is taking more than 5 minutes (300 seconds) for a query.
+        summary: A query is taking longer than 5 minutes.
+      expr: |-
+        cnpg_backends_max_tx_duration_seconds > 300
+      for: 1m
+      labels:
+        severity: warning
+    - alert: BackendsWaiting
+      annotations:
+        description: Pod {{ $labels.pod  }} has been waiting for longer than 5 minutes
+        summary: If a backend is waiting for longer than 5 minutes
+      expr: |-
+        cnpg_backends_waiting_total > 300
+      for: 1m
+      labels:
+        severity: warning
+    - alert: PGDatabaseXidAge
+      annotations:
+        description: Over 150,000,000 transactions from frozen xid on pod {{ $labels.pod  }}
+        summary: Number of transactions from the frozen XID to the current one
+      expr: |-
+        cnpg_pg_database_xid_age > 300000000
+      for: 1m
+      labels:
+        severity: warning
+    - alert: PGReplication
+      annotations:
+        description: Standby is lagging behind by over 300 seconds (5 minutes)
+        summary: The standby is lagging behind the primary
+      expr: |-
+        cnpg_pg_replication_lag > 300
+      for: 1m
+      labels:
+        severity: warning
+    - alert: LastFailedArchiveTime 
+      annotations:
+        description: Archiving failed for {{ $labels.pod }}
+        summary: Checks the last time archiving failed. Will be < 0 when it has not failed.
+      expr: |-
+        (cnpg_pg_stat_archiver_last_failed_time - cnpg_pg_stat_archiver_last_archived_time) > 1
+      for: 1m
+      labels:
+        severity: warning
+    - alert: DatabaseDeadlockConflicts 
+      annotations:
+        description: There are over 10 deadlock conflicts in {{ $labels.pod }}
+        summary: Checks the number of database conflicts
+      expr: |-
+        cnpg_pg_stat_database_deadlocks > 10
+      for: 1m
+      labels:
+        severity: warning
+    - alert: ReplicaFailingReplication
+      annotations:
+        description: Replica {{ $labels.pod }} is failing to replicate
+        summary: Checks if the replica is failing to replicate
+      expr: |-
+        cnpg_pg_replication_in_recovery > cnpg_pg_replication_is_wal_receiver_up
+      for: 1m
+      labels:
+        severity: warning
+#
+# folding in rules based on non-cnpg postgres metrics
+#
+    - alert: PostgresqlDown
+      expr: cnpg_collector_up == 0
+      for: 0m
+      labels:
+        severity: critical
+      annotations:
+        summary: Postgresql down (instance {{ $labels.instance }})
+        description: "Postgresql instance is down\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
+    - alert: PostgresqlRestarted
+      expr: time() - cnpg_pg_postmaster_start_time < 60
+      for: 0m
+      labels:
+        severity: critical
+      annotations:
+        summary: Postgresql restarted (instance {{ $labels.instance }})
+        description: "Postgresql restarted\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
+    - alert: PostgresqlHighRollbackRate
+      expr: sum by (namespace,datname) ((rate(cnpg_pg_stat_database_xact_rollback{datname!~"template.*|postgres",datid!="0"}[3m])) / ((rate(cnpg_pg_stat_database_xact_rollback{datname!~"template.*|postgres",datid!="0"}[3m])) + (rate(cnpg_pg_stat_database_xact_commit{datname!~"template.*|postgres",datid!="0"}[3m])))) > 0.02
+      for: 0m
+      labels:
+        severity: warning
+      annotations:
+        summary: Postgresql high rollback rate (instance {{ $labels.instance }})
+        description: "Ratio of transactions being aborted compared to committed is > 2 %\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
+#   - alert: PostgresqlCommitRateLow
+#     expr: rate(pg_stat_database_xact_commit[1m]) < 10
+#     for: 2m
+#     labels:
+#       severity: critical
+#     annotations:
+#       summary: Postgresql commit rate low (instance {{ $labels.instance }})
+#       description: "Postgresql seems to be processing very few transactions\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"    - alert: PostgresqlCommitRateLow
+#     expr: rate(cnpg_pg_stat_database_xact_commit[1m]) < 10
+#     for: 2m
+#     labels:
+#       severity: critical
+#     annotations:
+#       summary: Postgresql commit rate low (instance {{ $labels.instance }})
+#       description: "Postgresql seems to be processing very few transactions\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
+#   - alert: PostgresqlUnusedReplicationSlot
+#     expr: cnpg_pg_replication_slots_active == 0
+#     for: 1m
+#     labels:
+#       severity: warning
+#     annotations:
+#       summary: Postgresql unused replication slot (instance {{ $labels.instance }})
+#       description: "Unused Replication Slots\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"

package/src/helm-charts/prom-operator/rules/{elasticsearch-rules.yaml.ovh → elasticsearch-rules.yaml}

@@ -17,7 +17,6 @@ spec:
       annotations:
         summary: "Elasticsearch Heap Usage Too High (instance {{ $labels.instance }})"
         description: "The heap usage is over 90% for 5m (currently at {{ $value }}% )"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchHeapUsageWarning
       expr: (elasticsearch_jvm_memory_used_bytes{area="heap"} / elasticsearch_jvm_memory_max_bytes{area="heap"}) * 100 > 80
@@ -27,7 +26,6 @@ spec:
       annotations:
         summary: "Elasticsearch Heap Usage warning (instance {{ $labels.instance }})"
         description: "The heap usage is over 80% for 5m (currently at {{ $value }}% )"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchDiskSpaceLow
       expr: elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 < 20
@@ -37,7 +35,6 @@ spec:
       annotations:
         summary: "Elasticsearch disk space low (instance {{ $labels.instance }})"
         description: "The disk usage is over 80% (currently at {{ $value }}% )"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchDiskOutOfSpace
       expr: elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 < 10
@@ -48,7 +45,6 @@ spec:
       annotations:
         summary: "Elasticsearch disk out of space (instance {{ $labels.instance }})"
         description: "The disk usage is over 90% (currently at {{ $value }}% )"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchClusterRed
       expr: elasticsearch_cluster_health_status{color="red"} == 1
@@ -58,7 +54,6 @@ spec:
       annotations:
         summary: "Elasticsearch Cluster Red (instance {{ $labels.instance }})"
         description: "Elastic Cluster is in an unhealthy state"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchClusterYellow
       expr: elasticsearch_cluster_health_status{color="yellow"} == 1
@@ -68,7 +63,6 @@ spec:
       annotations:
         summary: "Elasticsearch Cluster Yellow (instance {{ $labels.instance }})"
         description: "Elastic Cluster is in an unhealthy state"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchRelocationShards
       expr: elasticsearch_cluster_health_relocating_shards > 0
@@ -78,7 +72,6 @@ spec:
       annotations:
         summary: "Elasticsearch relocation shards (instance {{ $labels.instance }})"
         description: "Number of relocation shards for 20 min is {{ $value }}"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchInitializingShards
       expr: elasticsearch_cluster_health_initializing_shards > 0
@@ -88,7 +81,6 @@ spec:
       annotations:
         summary: "Elasticsearch initializing shards (instance {{ $labels.instance }})"
         description: "Number of initializing shards for 10 min is {{ $value }}"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchUnassignedShards
       expr: elasticsearch_cluster_health_unassigned_shards > 0
@@ -98,7 +90,6 @@ spec:
       annotations:
         summary: "Elasticsearch unassigned shards (instance {{ $labels.instance }})"
         description: "Number of unassigned shards for 2 min is {{ $value }}"
-        dashboard: "OVH:<MONITORING>/elasticsearch"
 
     - alert: ElasticsearchPendingTasks
       expr: elasticsearch_cluster_health_number_of_pending_tasks > 0
@@ -108,4 +99,3 @@ spec:
       annotations:
         summary: "Elasticsearch pending tasks (instance {{ $labels.instance }})"
         description: "Number of pending tasks for 10 min is {{ $value }}. Cluster is working slowly."
-        dashboard: "OVH:<MONITORING>/elasticsearch"

package/src/helm-charts/prom-operator/rules/{gcp-rules.yaml.ovh → gcp-rules.yaml}

@@ -25,7 +25,6 @@ spec:
       annotations:
         summary: "High Firebase load detected"
         description: "Firebase load is above 90% (current value is: {{ $value | humanize }}%)"
-        dashboard: "OVH:<MONITORING>/firebase"   
     - alert: PubSubUndeliveredMessages
       expr: sum(stackdriver_pubsub_subscription_pubsub_googleapis_com_subscription_num_undelivered_messages) by (subscription_id) > 1000
       for: 5m 
@@ -35,7 +34,6 @@ spec:
       annotations:
         summary: "High Number of Undelivered Messages on PubSub"
         description: "Undelivered message count on topic {{$labels.subscription_id}} is greater than 1000"
-        dashboard: "OVH:<MONITORING>/stackdriver"
     - alert: PubSubOldUnackedMessages
       expr: stackdriver_pubsub_subscription_pubsub_googleapis_com_subscription_oldest_unacked_message_age > 900
       for: 5m 
@@ -44,4 +42,3 @@ spec:
       annotations:
         summary: "Old messages left unacked on PubSub"
         description: "Messages on {{$labels.subscription_id}} has been unacked for more than 15m"
-        dashboard: "OVH:<MONITORING>/stackdriver"

package/src/helm-charts/prom-operator/rules/{kubernetes-rules.yaml.ovh → kubernetes-rules.yaml}

@@ -58,7 +58,6 @@ spec:
       annotations:
         summary: "Kubernetes PVC Free Space < 10%"
         description: "PVC volume {{ $labels.persistentvolumeclaim }} is almost full - down to {{ $value | humanize }}% available"
-        dashboard: "OVH:<MONITORING>/k8s-pvc/pvc-usage?var-volume={{ $labels.persistentvolumeclaim }}"
 
 #   - alert: KubernetesVolumeFullInFourDays
 #     expr: predict_linear(kubelet_volume_stats_available_bytes[6h], 4 * 24 * 3600) < 0
@@ -68,7 +67,6 @@ spec:
 #     annotations:
 #       summary: "Kubernetes Volume full in four days "
 #       description: "{{ $labels.namespace }}/{{ $labels.persistentvolumeclaim }} is expected to fill up within four days. Currently {{ $value | humanize }}% is available."
-#       dashboard: "OVH:<MONITORING>/pvc"
 
     - alert: KubernetesPersistentvolumeError
       expr: kube_persistentvolume_status_phase{phase=~"Failed|Pending",job="kube-state-metrics"} > 0
@@ -88,7 +86,6 @@ spec:
       annotations:
         summary: "Kubernetes HPA scale capability"
         description: "Kubernetes has scaled {{ $labels.hpa }} to max number of scaled pods."
-        dashboard: "OVH:<MONITORING>/k8-deployment"
 
     - alert: KubernetesPodNotHealthy
       expr: kube_pod_status_phase{phase=~"Pending|Unknown|Failed"} == 1

package/src/helm-charts/prom-operator/rules/{leverege-rules.yaml.ovh → leverege-rules.yaml}

@@ -17,4 +17,3 @@ spec:
       annotations:
         summary: Apps are restarting frequently
         description: "{{ $labels.app }} is in a crash loop"
-        dashboard: "OVH:<MONITORING>/stackdriver"

package/src/helm-charts/prom-operator/rules/{postgres-rules.yaml.ovh → postgres-rules.yaml}

@@ -17,7 +17,6 @@ spec:
       annotations:
         summary: "Postgresql down"
         description: "Postgresql instance is down: check {{ $labels.release }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlRestarted
       expr: time() - pg_postmaster_start_time_seconds < 60
@@ -27,7 +26,6 @@ spec:
       annotations:
         summary: "Postgresql restarted"
         description: "Postgresql restarted: check {{ $labels.release }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlExporterError
       expr: pg_exporter_last_scrape_error > 0
@@ -37,7 +35,6 @@ spec:
       annotations:
         summary: "Postgresql exporter error for {{ $labels.release }}"
         description: "Postgresql exporter is showing errors. Metrics may be outdated"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlReplicationLag
       expr: (pg_replication_lag > 10) and ON(instance) (pg_replication_is_replica == 1)
@@ -47,7 +44,6 @@ spec:
       annotations:
         summary: "Postgresql replication lag"
         description: "PostgreSQL replication lag is going up (> 10s): check {{ $labels.release }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlTableNotVacuumed
       expr: (pg_stat_user_tables_last_autovacuum > 0) and (time() - pg_stat_user_tables_last_autovacuum > 60 * 60 * 24)
@@ -57,7 +53,6 @@ spec:
       annotations:
         summary: "Postgresql table not vacuumed"
         description: "Table has not been vacuum for 24 hours: check {{ $labels.instance }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlTableNotAutoAnalyzed
       expr: (pg_stat_user_tables_last_autoanalyze > 0) and (time() - pg_stat_user_tables_last_autoanalyze > 60 * 60 * 24)
@@ -67,7 +62,6 @@ spec:
       annotations:
         summary: "Postgresql table not analyzed (instance {{ $labels.instance }})"
         description: "Table {{ $labels.relname }} has not been analyzed for 24 hours: check {{ $labels.release }} - {{ $labels.datname }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlDeadLocks
       expr: rate(pg_stat_database_deadlocks{datname!~"template.*|postgres"}[1m]) > 0
@@ -77,7 +71,6 @@ spec:
       annotations:
         summary: "Postgresql dead locks"
         description: "PostgreSQL has dead-locks: check {{ $labels.release }} - {{ $labels.datname }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlSlowQueries
       expr: pg_slow_queries > 0
@@ -87,7 +80,6 @@ spec:
       annotations:
         summary: "Postgresql slow queries"
         description: "PostgreSQL executing slow queries"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlHighRollbackRate
       expr: rate(pg_stat_database_xact_rollback{datname!~"template.*"}[3m]) / rate(pg_stat_database_xact_commit{datname!~"template.*"}[3m]) > 0.02
@@ -97,7 +89,6 @@ spec:
       annotations:
         summary: "Postgresql high rollback rate on {{ $labels.release }} - {{ $labels.datname }}"
         description: "Ratio of transactions being aborted compared to committed is > 2 %"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlCommitRateLow
       expr: rate(pg_stat_database_xact_commit[1m]) < 10
@@ -107,7 +98,6 @@ spec:
       annotations:
         summary: "Postgresql commit rate low on {{ $labels.release }} - {{ $labels.datname }}"
         description: "Postgres seems to be processing very few transactions"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlLowXidConsumption
       expr: rate(pg_txid_current[1m]) < 5
@@ -117,7 +107,6 @@ spec:
       annotations:
         summary: "Postgresql low XID consumption on {{ $labels.release }} - {{ $labels.datname }}"
         description: "Postgresql seems to be consuming transaction IDs very slowly"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqllowXlogConsumption
       expr: rate(pg_xlog_position_bytes[1m]) < 100
@@ -127,7 +116,6 @@ spec:
       annotations:
         summary: "Postgresqllow XLOG consumption on {{ $labels.release }} - {{ $labels.datname }}"
         description: "Postgres seems to be consuming XLOG very slowly"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlWaleReplicationStopped
       expr: rate(pg_xlog_position_bytes[1m]) == 0
@@ -137,7 +125,6 @@ spec:
       annotations:
         summary: "Postgresql WAL-E replication stopped on {{ $labels.release }} - {{ $labels.datname }}"
         description: "WAL-E replication seems to be stopped"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlHighRateStatementTimeout
       expr: rate(postgresql_errors_total{type="statement_timeout"}[5m]) > 3
@@ -147,7 +134,6 @@ spec:
       annotations:
         summary: "Postgresql high rate statement timeout"
         description: "Postgres transactions showing high rate of statement timeouts on {{ $labels.release }} - {{ $labels.datname }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlHighRateDeadlock
       expr: rate(postgresql_errors_total{type="deadlock_detected"}[1m]) * 60 > 1
@@ -157,7 +143,6 @@ spec:
       annotations:
         summary: "Postgresql high rate deadlock"
         description: "Postgres detected deadlocks on {{ $labels.release }} - {{ $labels.datname }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlReplicationLabBytes
       expr: (pg_xlog_position_bytes and pg_replication_is_replica == 0) - on (environment) group_right(instance) (pg_xlog_position_bytes and pg_replication_is_replica == 1) > 1e+09
@@ -167,7 +152,6 @@ spec:
       annotations:
         summary: "Postgresql replication lab bytes"
         description: "Postgres Replication lag (in bytes) is high on {{ $labels.release }} - {{ $labels.datname }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlTooManyDeadTuples
       expr: ((pg_stat_user_tables_n_dead_tup > 10000) / (pg_stat_user_tables_n_live_tup + pg_stat_user_tables_n_dead_tup)) >= 0.1 unless ON(instance) (pg_replication_is_replica == 1)
@@ -177,7 +161,6 @@ spec:
       annotations:
         summary: "Postgresql too many dead tuples"
         description: "PostgreSQL dead tuples is too large ( {{ $value }} dead tuples) on {{ $labels.release }} - {{ $labels.datname }}"
-        dashboard: "OVH:<MONITORING>/postgres"
 
     - alert: PostgresqlTooManyLocksAcquired
       expr: ((sum (pg_locks_count)) / (pg_settings_max_locks_per_transaction * pg_settings_max_connections)) > 0.20
@@ -187,4 +170,3 @@ spec:
       annotations:
         summary: "Postgresql too many locks acquired on {{ $labels.statefulset.kubernetes.io_pod_name }}"
         description: "Too many locks acquired on the database. If this alert happens frequently, we may need to increase the postgres setting max_locks_per_transaction."
-        dashboard: "OVH:<MONITORING>/postgres"

package/src/helm-charts/prom-operator/rules/{redis-rules.yaml.ovh → redis-rules.yaml}

@@ -16,7 +16,6 @@ spec:
       annotations:
         summary: "Redis down (instance {{ $labels.instance }})"
         description: "Redis instance is down"
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisMissingMaster
       expr: count(redis_instance_info{role="master"}) == 0
@@ -26,7 +25,6 @@ spec:
       annotations:
         summary: "Redis missing master (instance {{ $labels.instance }})"
         description: "Redis cluster has no node marked as master."
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisTooManyMasters
       expr: count(redis_instance_info{role="master"}) > 1
@@ -36,7 +34,6 @@ spec:
       annotations:
         summary: "Redis too many masters (instance {{ $labels.instance }})"
         description: "Redis cluster has too many nodes marked as master."
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisDisconnectedSlaves
       expr: count without (instance, job) (redis_connected_slaves) - sum without (instance, job) (redis_connected_slaves) - 1 > 1
@@ -46,7 +43,6 @@ spec:
       annotations:
         summary: "Redis disconnected slaves (instance {{ $labels.instance }})"
         description: "Redis not replicating for all slaves. Consider reviewing the redis replication status."
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisReplicationBroken
       expr: delta(redis_connected_slaves[1m]) < 0
@@ -56,7 +52,6 @@ spec:
       annotations:
         summary: "Redis replication broken (instance {{ $labels.instance }})"
         description: "Redis instance lost a slave"
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisClusterFlapping
       expr: changes(redis_connected_slaves[5m]) > 2
@@ -66,7 +61,6 @@ spec:
       annotations:
         summary: "Redis cluster flapping (instance {{ $labels.instance }})"
         description: "Changes have been detected in Redis replica connection. This can occur when replica nodes lose connection to the master and reconnect (a.k.a flapping)."
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisOutOfMemory
       expr: redis_memory_used_bytes / redis_total_system_memory_bytes * 100 > 90
@@ -76,7 +70,6 @@ spec:
       annotations:
         summary: "Redis out of memory (instance {{ $labels.instance }})"
         description: "Redis is running out of memory ( {{ $value }}% )"
-        dashboard: "OVH:<MONITORING>/redis"
 
     - alert: RedisRejectedConnections
       expr: increase(redis_rejected_connections_total[1m]) > 0
@@ -86,5 +79,3 @@ spec:
       annotations:
         summary: "Redis rejected connections (instance {{ $labels.instance }})"
         description: "Some connections to Redis has been rejected. Please check {{ $labels.app }}"
-        dashboard: "OVH:<MONITORING>/redis"
-

package/src/helm-charts/prom-operator/rules/{traefik-rules.yaml.ovh → traefik-rules.yaml}

@@ -25,4 +25,3 @@ spec:
 #     annotations:
 #       summary: "Traefik high HTTP 4xx error rate on {{ $labels.service }}"
 #       description: "Traefik backend 4xx error rate is above 10% (currently at {{ $value }}%)"
-#       dashboard: "OVH:<MONITORING>/traefik"

package/src/helm-charts/prom-operator/rules/{velero-rules.yaml.ovh → velero-rules.yaml}

@@ -16,7 +16,6 @@ spec:
       annotations:
         summary: "Velero schedule {{ $labels.schedule }} backup failed to execute properly"
         description: "It has been over 30 hours since the last successful backup"
-        dashboard: "OVH:<MONITORING>/velero"
     - alert: NoVeleroBackups
       expr: velero_backup_success_total{schedule!=""}  == 0
       for: 30h
@@ -25,4 +24,3 @@ spec:
       annotations:
         summary: "Velero has not made any backups yet"
         description: "No backups have successfully been made since velero was initialized (or restarted), go check it out ASAP"
-        dashboard: "OVH:<MONITORING>/velero"

package/src/helm-charts/prom-operator/stackdriver-exporter.yaml.ovh

@@ -5,7 +5,7 @@
 fullnameOverride: "prometheus-stack-stackdriver-metrics"
 
 stackdriver:
-  projectId: "OVH:<PROJECT_NAME>"
+  projectId: "${PROJECT_NAME}"
   metrics:
     typePrefixes: "pubsub.googleapis.com/subscription/oldest_unacked_message_age,pubsub.googleapis.com/subscription/num_undelivered_messages,pubsub.googleapis.com/subscription/pull_ack_request_count,pubsub.googleapis.com/subscription/streaming_pull_ack_request_count,pubsub.googleapis.com/topic/message_sizes,pubsub.googleapis.com/topic/send_request_count,firebasedatabase.googleapis.com/io/database_load,firebasedatabase.googleapis.com/network/sent_bytes_count,firebasedatabase.googleapis.com/network/active_connections"
 

package/src/helm-charts/prom-operator/update-crd.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+VERSION="v0.78.1"
+CRDOPTS="--force-conflicts --server-side"
+
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply $CRDOPTS -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$VERSION/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml

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

@@ -4,7 +4,7 @@ showInstalling "Redis"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/redis"
 
-[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.2.1"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.3.0"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

package/src/helm-charts/resource-server/values-local.yaml

@@ -4,7 +4,7 @@
 #     - npm run sequelizeRunMigrations
 #
 image:
-  tag: # v1.5.1
+  tag: # v1.7.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/scheduler/values-local.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: # v3.1.2
+  tag: # v3.3.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/transponder-bq/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-bq
 
 image:
-  tag: # v5.2.4
+  tag: # v5.3.4
 
 config:
   TRANSPONDER_RUN_MODE: "bigQueryJson"

package/src/helm-charts/transponder-dh/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-dh
 
 image:
-  tag: # v5.2.4
+  tag: # v5.3.4
 
 config:
   TRANSPONDER_RUN_MODE: "denseHistoryCombined"

package/src/helm-charts/transponder-rt/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-rt
 
 image:
-  tag: # v5.2.4
+  tag: # v5.3.4
 
 config:
   TRANSPONDER_RUN_MODE: "rt"

package/src/helm-charts/transponder-tsdb/values-local.yaml

@@ -7,7 +7,7 @@
 nameOverride: transponder-tsdb
 
 image:
-  tag: # v5.2.4
+  tag: # v5.3.4
 
 config:
   TRANSPONDER_RUN_MODE: "timescale"

package/src/helm-charts/vin-decoder-server/values-local.yaml

@@ -0,0 +1,7 @@
+image:
+  tag: # v4.1.0
+
+config:
+  LOG_CONFIG: '{"type":"pino","level":"warn"}'
+  PROJECT_ID: "set-in-values-local"
+  SYSTEM_ID: "set-in-values-local"

package/src/overwhelm.mjs

@@ -15,20 +15,29 @@ import parse from 'parse-gitignore'
 import ask from 'readline-sync'
 import YAML from 'js-yaml'
 
-import { debug, disableDebug, err, errorExit, isString, log, shellCmd } from './Utils.mjs'
+import {
+  debug,
+  disableDebug,
+  err,
+  errorExit,
+  isString,
+  log,
+  shellCmd,
+} from './Utils.mjs'
 
 const optionsDefinitions = [
   /* eslint-disable no-multi-spaces */
-  { name : 'context',  alias : 'x', type : String, default : '' },
-  { name : 'section',  alias : 's', type : String, default : 'default' },
-  { name : 'key',      alias : 'k', type : String },
-  { name : 'export',   alias : 'e', type : Boolean, default : false },
-  { name : 'continue', alias : 'c', type : Boolean, default : false },
-  { name : 'checkctx', alias : 't', type : Boolean, default : false }, // checks overwhelm context
-  { name : 'fetchctx', alias : 'f', type : Boolean, default : false }, // fetch and set k8s context
-  { name : 'genvals',  alias : 'g', type : Boolean, default : false }, // only generates values.yaml
-  { name : 'matchk8s', alias : 'm', type : Boolean, default : false }, // checks k8s context
-  { name : 'verbose',  alias : 'v', type : Boolean, default : false },
+  { name : 'context',    alias : 'x', type : String, default : '' },
+  { name : 'deprecated', alias : 'd', type : Boolean, default : false },
+  { name : 'section',    alias : 's', type : String, default : 'default' },
+  { name : 'key',        alias : 'k', type : String },
+  { name : 'export',     alias : 'e', type : Boolean, default : false },
+  { name : 'continue',   alias : 'c', type : Boolean, default : false },
+  { name : 'checkctx',   alias : 't', type : Boolean, default : false }, // checks overwhelm context
+  { name : 'fetchctx',   alias : 'f', type : Boolean, default : false }, // fetch and set k8s context
+  { name : 'genvals',    alias : 'g', type : Boolean, default : false }, // only generates values.yaml
+  { name : 'matchk8s',   alias : 'm', type : Boolean, default : false }, // checks k8s context
+  { name : 'verbose',    alias : 'v', type : Boolean, default : false },
   /* eslint-enable no-multi-spaces */
 ]
 const args = cliArgs( optionsDefinitions )
@@ -36,6 +45,12 @@ const args = cliArgs( optionsDefinitions )
 // when using --key we only want the key contents w/o debug info
 if ( args.key ) { disableDebug() }
 
+// define a deprecation warning function that depends on arg.deprecated
+const deprecated = ( deprecation ) => {
+  if ( !args.deprecated ) { return }
+  log( `${chalk.yellow.bold( '***DEPRECATED:' )} ${deprecation}\n` )
+}
+
 // See if we are in a monorepo, which changes some of the rules.
 const gitTop = await shellCmd( 'git rev-parse --show-toplevel' )
 
@@ -180,7 +195,7 @@ const yams = glob.sync( 'values-*.yaml' )
 
 // A function to apply the replacements to all of the matching yaml which
 // will error out if it runs into an unknown OVH<tag>.
-const doReplacements = ( yamls, replacements ) => {
+const doReplacements = ( yamls, replacements, fileName = 'default-config.yaml' ) => {
   let replYaml = yamls
 
   // wrap special chars with quotes if needed, like "#---incident-alerts---"
@@ -188,10 +203,18 @@ const doReplacements = ( yamls, replacements ) => {
     return /[#$?*]/g.test( raw ) ? `"${raw}"` : raw
   }
 
-  Object.keys( replacements ).forEach( ( repl ) => {
-    const replaceThis = new RegExp( `OVH:<${repl}>`, 'g' ) // eslint-disable-line security/detect-non-literal-regexp
-    const withThat = quoteSpecials( `${replacements[repl]}` )
-    replYaml = replYaml.replace( replaceThis, withThat )
+  // process both ${VARIABLE} and deprecate OVH:<VARIABLES> styles
+  Object.keys( replacements ).forEach( ( key ) => {
+    // replace ${VARIABLE} syntax
+    const replaceVariable = new RegExp( `\\$\\{${key}\\}`, 'g' ) // eslint-disable-line security/detect-non-literal-regexp
+    replYaml = replYaml.replace( replaceVariable, quoteSpecials( `${replacements[key]}` ) )
+
+    // replace OVH:<VARIABLE> syntax and warn about deprecation
+    const replaceDeprecated = new RegExp( `OVH:<${key}>`, 'g' ) // eslint-disable-line security/detect-non-literal-regexp
+    if ( replYaml.match( replaceDeprecated ) ) {
+      deprecated( `OVH:<${key}> is deprecated. Please replace it with \${${key}} in ${fileName}` )
+      replYaml = replYaml.replace( replaceDeprecated, quoteSpecials( `${replacements[key]}` ) )
+    }
   } )
 
   // Verify all replaceables have been handled, or error out.
@@ -296,7 +319,6 @@ ahoy.forEach( ( dir ) => {
     const valuesLocal = `${dir}/values-local.yaml`
 
     if ( validValuesLocalConfig( valuesLocal ) ) {
-      debug( { valuesLocal }, 'rendering values.yaml' )
       valuesOut += '\n# OVERWHELM => values-local.yaml\n\n'
       valuesOut += fs.readFileSync( valuesLocal, { encoding : 'utf-8' } )
     }
@@ -308,28 +330,17 @@ ahoy.forEach( ( dir ) => {
     const valuesAll = YAML.load( valuesOut ) || {}
     const valuesSvc = {
       service : {
-        project_id : 'OVH:<PROJECT_ID>',
-        project_name : 'OVH:<PROJECT_NAME>',
-        host : 'OVH:<HOST>',
-        ingress : 'OVH:<INGRESS>',
+        /* eslint-disable no-template-curly-in-string */
+        project_id : '${PROJECT_ID}',
+        project_name : '${PROJECT_NAME}',
+        host : '${HOST}',
+        ingress : '${INGRESS}',
+        /* eslint-enable no-template-curly-in-string */
       }
     }
     const valuesMerged = YAML.dump( deepmerge( valuesSvc, valuesAll ), { quotingType : '"' } )
 
-    valuesOut = doReplacements( valuesMerged, over )
-
-    // DEPRECATED once siren and manheim are platform 4.0
-    // If we are going to override then we need to convert it to YAML and
-    // do a deepmerge to combine the values.
-    const valuesOverride = `${dir}/values-override.yaml`
-
-    if ( fs.existsSync( valuesOverride ) ) {
-      log( `===>Applying Overrides=> ${valuesOverride}` )
-      const overrides = YAML.load( fs.readFileSync( valuesOverride, { encofind : 'utf-8' } ) )
-      const allValues = YAML.load( valuesOut )
-      valuesOut = YAML.dump( deepmerge( allValues, overrides ), { quotingType : '"' } )
-    }
-    // DEPRECATED
+    valuesOut = doReplacements( valuesMerged, over, valuesLocal )
 
     fs.writeFileSync( `${dir}/values.yaml`, valuesOut )
   }
@@ -338,8 +349,9 @@ ahoy.forEach( ( dir ) => {
 // we can also apply replaceables to all .ovh files in the project
 glob.sync( '**/*.ovh' ).forEach( ( cfgmap ) => {
   const target = cfgmap.replace( /.ovh$/, '' )
+  deprecated( `rename deprecated ${cfgmap} OVH file to ${target}` )
   let valuesOut = fs.readFileSync( cfgmap, { encoding : 'utf-8' } )
-  valuesOut = doReplacements( valuesOut, over )
+  valuesOut = doReplacements( valuesOut, over, cfgmap )
   fs.writeFileSync( target, valuesOut )
 } )
 

package/src/pkgck.sh

@@ -39,6 +39,14 @@ check_babel () {
   printf $C_stat
 }
 
+check_har () {
+  local C_stat=$(bad)
+  local prep="`node -p \"require('./package.json').scripts.prepare\"`"
+  local isHar=`echo $prep | egrep -e "hook-and-release"`
+  [ ! -z "$isHar" ] && C_stat=$(good)
+  printf $C_stat
+}
+
 check_circle () {
   local C_stat=$(bad)
   [ -f ".circleci/config.yml" ] && C_stat=$(good)
@@ -128,13 +136,14 @@ check_repo() {
     [ $? -ne 0 ] && needspush='!tags'
   fi
   local babel7=$(check_babel)
+  local hookar=$(check_har)
   local circle=$(check_circle)
   local eslint=$(check_eslint)
   local esmlib=$(check_ESM)
   local license=$(check_license)
   local scoped=$(check_scope)
-  [ $(( $repos % 15)) -eq 0 ] && printf "\n%35s pkg      git  cln scop cir lic ESM bl7\n"
-  printf "%32s: %-8s %-16s %s  %8s  %s   %s   %s   %s  %s\n" ${dir:0:32} $pkgver $(check_git_version $gitver $pkgver) $localmods $scoped $circle $license $esmlib $babel7 "$needspush"
+  [ $(( $repos % 15)) -eq 0 ] && printf "\n%35s pkg      git  cln scop cir lic ESM har\n"
+  printf "%32s: %-8s %-16s %s  %8s  %s   %s   %s   %s  %s\n" ${dir:0:32} $pkgver $(check_git_version $gitver $pkgver) $localmods $scoped $circle $license $esmlib $hookar "$needspush"
   let "repos++"
   cd - &> /dev/null
 }

package/src/push-model-registry.mjs

@@ -0,0 +1,145 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs';
+import path from 'node:path';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import {Storage} from '@google-cloud/storage';
+import crc32c from 'fast-crc32c';
+
+const storage = new Storage();
+
+function getAllFiles(dirPath, arrayOfFiles = []) {
+  const files = fs.readdirSync(dirPath);
+
+  files.forEach(file => {
+    const filePath = path.join(dirPath, file);
+    if (fs.lstatSync(filePath).isDirectory()) {
+      arrayOfFiles = getAllFiles(filePath, arrayOfFiles);
+    } else {
+      arrayOfFiles.push(filePath);
+    }
+  });
+
+  return arrayOfFiles;
+}
+
+async function main() {
+  // Get git branch name
+  const branchName = fs.readFileSync('.git/HEAD', 'utf8').split('/').pop().trim();
+
+  const bucketName = `${branchName}-triton-model-registry`;
+
+  // Get all blobs in the bucket
+  let files = [];
+  try {
+    [files] = await storage.bucket(bucketName).getFiles();
+  } catch (error) {
+    if (error.code === 404) {
+      console.error(`Bucket ${bucketName} does not exist.`);
+      return;
+    } else {
+      throw error;
+    }
+  }
+
+  // Get all not hidden blobs in the current path in the filesystem
+  const localFiles = getAllFiles('./models').filter(file => !path.basename(file).startsWith('.'));
+
+  const filesToDelete = files.filter(file => !localFiles.find(localFile => localFile === file.name));
+
+  console.log(`${chalk.underline(filesToDelete.length + " file(s)")} in ${chalk.underline(bucketName)} without a ${chalk.underline("local")} counterpart`);
+  filesToDelete.forEach(file => console.log(chalk.red(file.name)));
+
+  if (filesToDelete.length > 0) console.log("");
+
+  const filesToAdd = [];
+  const filesToReplace = [];
+
+  const metadataPromises = localFiles.map(async file => {
+    const localFileChecksum = Buffer.from(crc32c.calculate(fs.readFileSync(file)).toString(16), 'hex').toString('base64');
+    const remoteFile = files.find(blob => blob.name === file);
+    if (remoteFile) {
+      const [metadata] = await remoteFile.getMetadata();
+      return { file, localFileChecksum, remoteFileChecksum: metadata.crc32c };
+    } else {
+      return { file, localFileChecksum, remoteFileChecksum: null };
+    }
+  });
+
+  const metadataResults = await Promise.all(metadataPromises);
+
+  metadataResults.forEach(({ file, localFileChecksum, remoteFileChecksum }) => {
+    if (remoteFileChecksum) {
+      if (localFileChecksum !== remoteFileChecksum) {
+        filesToReplace.push(file);
+      }
+    } else {
+      filesToAdd.push(file);
+    }
+  });
+
+  console.log(`${chalk.underline(filesToAdd.length + " file(s)")} to be added to ${chalk.underline(bucketName)}`);
+  filesToAdd.forEach(file => console.log(chalk.green(file)));
+
+  if (filesToAdd.length > 0) console.log("");
+
+  console.log(`${chalk.underline(filesToReplace.length + " file(s)")} to be replaced in ${chalk.underline(bucketName)}`);
+  filesToReplace.forEach(file => console.log(chalk.yellow(file)));
+
+  if (filesToReplace.length > 0) console.log("");
+
+  if (filesToDelete.length > 0) {
+    const {confirm} = await inquirer.prompt({
+      type: 'confirm',
+      name: 'confirm',
+      message: `Do you want to delete ${filesToDelete.length} file(s) from ${bucketName}?`,
+    });
+
+    if (!confirm) {
+      return;
+    }
+
+    // Remove all blobs that are not in the local filesystem
+    const deletePromises = filesToDelete.map(async file => {
+      console.log(`Deleting ${file.name} from ${bucketName}`);
+      return storage.bucket(bucketName).file(file.name).delete();
+    });
+    
+    await Promise.all(deletePromises);
+    console.log("")
+  }
+
+  if (filesToAdd.length > 0 || filesToReplace.length > 0) {
+    const {confirm} = await inquirer.prompt({
+      type: 'confirm',
+      name: 'confirm',
+      message: `Do you want to upload ${filesToAdd.length + filesToReplace.length} file(s) to ${bucketName}?`,
+    });
+
+    if (!confirm) {
+      return;
+    }
+
+    // Upload all new files
+    const uploadPromises = filesToAdd.map(async file => {
+      console.log(`Uploading ${file} to ${bucketName}`);
+      return storage.bucket(bucketName).upload(file, {
+        destination: file,
+      });
+    });
+
+    // Replace all files with different checksums
+    const replacePromises = filesToReplace.map(async file => {
+      console.log(`Replacing ${file} in ${bucketName}`);
+      return storage.bucket(bucketName).upload(file, {
+        destination: file,
+      });
+    });
+    
+    await Promise.all([...uploadPromises, ...replacePromises]);
+    console.log("")
+  }
+}
+
+main().catch(console.error);

package/src/helm-charts/prom-operator/rules/gitignore

@@ -1 +0,0 @@
-*.yaml