Merge branch 'claude/grafana-version-display-V60eA' into 'main'

fix(monitoring): correct Flask backend URL in version panel

See merge request postgres-ai/postgres_ai!152

Author: NikolayS

config/grafana/dashboards/Self_Monitoring_Dashboard.json

@@ -100,12 +100,7 @@
           "url_options": {
             "method": "GET"
           },
-          "computed_columns": [
-            {
-              "selector": "concat('PostgresAI v', version, ' (built: ', build_ts, ')')",
-              "text": "display"
-            }
-          ]
+          "computed_columns": []
         }
       ],
       "title": "",

docker-compose.local.yml

@@ -3,6 +3,9 @@ services:
   monitoring_flask_backend:
     build:
       context: ./monitoring_flask_backend
+      args:
+        VERSION: local-dev
+        BUILD_TS: "${BUILD_TS:-local}"
     image: postgresai/monitoring_flask_backend:local
 
 

monitoring_flask_backend/app.py

@@ -53,11 +53,13 @@ def read_version_file(filepath, default='unknown'):
 
 @app.route('/version', methods=['GET'])
 def version():
-    """Return application version and build timestamp"""
-    return jsonify({
+    """Return application version and build timestamp as array for Grafana Infinity datasource"""
+    display = f"PostgresAI v{APP_VERSION} (built: {APP_BUILD_TS})"
+    return jsonify([{
         "version": APP_VERSION,
-        "build_ts": APP_BUILD_TS
-    })
+        "build_ts": APP_BUILD_TS,
+        "display": display
+    }])
 
 
 @app.route('/health', methods=['GET'])

monitoring_flask_backend/test_app.py

@@ -23,17 +23,31 @@ def test_version_endpoint_returns_json(self, client):
         assert response.status_code == 200
         assert response.content_type == 'application/json'
 
+    def test_version_endpoint_returns_array(self, client):
+        """Test that /version returns array for Grafana Infinity datasource."""
+        response = client.get('/version')
+        data = json.loads(response.data)
+        assert isinstance(data, list)
+        assert len(data) == 1
+
     def test_version_endpoint_contains_version_field(self, client):
         """Test that /version response contains version field."""
         response = client.get('/version')
         data = json.loads(response.data)
-        assert 'version' in data
+        assert 'version' in data[0]
 
     def test_version_endpoint_contains_build_ts_field(self, client):
         """Test that /version response contains build_ts field."""
         response = client.get('/version')
         data = json.loads(response.data)
-        assert 'build_ts' in data
+        assert 'build_ts' in data[0]
+
+    def test_version_endpoint_contains_display_field(self, client):
+        """Test that /version response contains pre-formatted display field."""
+        response = client.get('/version')
+        data = json.loads(response.data)
+        assert 'display' in data[0]
+        assert 'PostgresAI v' in data[0]['display']
 
 
 class TestReadVersionFile: