monitor support

Author: zlianzhuang

Makefile

@@ -34,6 +34,7 @@ operator-yaml: operator-image
 	cp jq-template.awk platforms/kubernetes/postgres-operator/deploy/jq-template.awk
 	cd platforms/kubernetes/postgres-operator/deploy/; awk -f jq-template.awk postgres-operator.yaml.template > postgres-operator.yaml
 exporter-image:
+	cp exporterversions.json image/exporter/versions.json
 	cd image/exporter; ./generate_image.sh
 
 format:

exporterversions.json

@@ -0,0 +1,3 @@
+{
+  "image": "radondb-postgres-exporter:v0.9.0"
+}

image/postgresql/Dockerfile.template

@@ -114,7 +114,7 @@ RUN set -eux; \
     sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list; \
     sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list; \
 	apt update; \
-	apt install -y --no-install-recommends vim sysstat inetutils-ping procps net-tools ssh sshpass ; \
+	apt install -y --no-install-recommends vim sysstat inetutils-ping procps net-tools ssh sshpass curl ; \
 	apt install -y --no-install-recommends gosu locales ; \
 	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ; \
 	apt-get clean; \

platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml

@@ -99,6 +99,28 @@ spec:
                 enum:
                 - true
                 - false
+              volume_type:
+                type: string
+                enum:
+                - 'local'
+                - 'cloud'
+              antiaffinity:
+                type: object
+                x-kubernetes-preserve-unknown-fields: true
+                properties:
+                  policy:
+                    type: string
+                    enum:
+                    - 'preferred'
+                    - 'required'
+                  podAntiAffinityTerm:
+                    type: string
+                    enum:
+                    - 'none'
+                    - 'autofailover-readwrite'
+                    - 'autofailover-readwrite-readonly'
+                  topologyKey:
+                    type: string
               services:
                 type: array
                 items:

platforms/kubernetes/postgres-operator/deploy/postgresql.yaml

@@ -12,6 +12,14 @@ spec:
     podAntiAffinityTerm: autofailover-readwrite   # none/autofailover-readwrite/autofailover-readwrite-readonly
     topologyKey: "kubernetes.io/hostname"         # when policy is required, only allow "kubernetes.io/hostname"
   services:
+    - selector: autofailover # autofailover/primary/standby/readonly/standby-readonly
+      metadata:
+        name: autofailover
+      spec:
+        type: ClusterIP
+        ports:
+          - name: exporter # cant' change the name
+            port: 9187 #targetPort: 9187
     - selector: primary # autofailover/primary/standby/readonly/standby-readonly
       metadata:
         name: readwrite
@@ -20,6 +28,8 @@ spec:
         ports:
           - name: prime # cant' change the name
             port: 5432
+          - name: exporter # cant' change the name
+            port: 9187
     - selector: standby-readonly
       metadata:
         name: standby-readonly
@@ -28,6 +38,8 @@ spec:
         ports:
           - name: prime # cant' change the name
             port: 5432
+          - name: exporter # cant' change the name
+            port: 9187
   autofailover:
     hbas:
       - host all all all md5
@@ -46,6 +58,13 @@ spec:
             limits:
               memory: "200Mi"
               cpu: "0.2"
+        - image: radondb-postgres-exporter:v0.9.0
+          imagePullPolicy: IfNotPresent
+          name: exporter # can't change the name
+          resources:
+            limits:
+              memory: "100Mi"
+              cpu: "0.1"
     volumeClaimTemplates:
       - metadata:
           name: data
@@ -59,9 +78,6 @@ spec:
       admin:
         - name: root
           password: root
-      maintenance:
-        - name: maintenance
-          password: maintenance
       normal:
         - name: lzzhang
           password: lzzhang
@@ -87,6 +103,13 @@ spec:
               limits:
                 memory: "200Mi"
                 cpu: "0.2"
+          - image: radondb-postgres-exporter:v0.9.0
+            imagePullPolicy: IfNotPresent
+            name: exporter # can't change the name
+            resources:
+              limits:
+                memory: "100Mi"
+                cpu: "0.1"
       volumeClaimTemplates:
         - metadata:
             name: data
@@ -111,6 +134,13 @@ spec:
               limits:
                 memory: "200Mi"
                 cpu: "0.2"
+          - image: radondb-postgres-exporter:v0.9.0
+            imagePullPolicy: IfNotPresent
+            name: exporter # can't change the name
+            resources:
+              limits:
+                memory: "100Mi"
+                cpu: "0.1"
       volumeClaimTemplates:
         - metadata:
             name: data

platforms/kubernetes/postgres-operator/postgres/constants.py

@@ -19,7 +19,9 @@
 CONTAINERS = "containers"
 CONTAINER_NAME = "name"
 PODSPEC_CONTAINERS_POSTGRESQL_CONTAINER = "postgresql"
+PODSPEC_CONTAINERS_EXPORTER_CONTAINER = "exporter"
 PRIME_SERVICE_PORT_NAME = "prime"
+EXPORTER_SERVICE_PORT_NAME = "exporter"
 HBAS = "hbas"
 CONFIGS = "configs"
 REPLICAS = "replicas"
@@ -142,6 +144,13 @@
       - ./pgenv
     command:
       - auto_failover
+  %s:
+    container_name: %s
+    image: ${exporterimage}
+    network_mode: host
+    restart: always
+    env_file:
+      - ./exporterenv
 '''
 
 # .env
@@ -150,10 +159,12 @@
 image={0}
 host_name={1}
 pgdata={2}
+exporterimage={3}
 '''
 
 # env_file
 DOCKER_COMPOSE_ENVFILE = "pgenv"
+DOCKER_COMPOSE_EXPORTER_ENVFILE = "exporterenv"
 
 # docker-compose data dirctory
 DOCKER_COMPOSE_DIR = "docker_compose"