Merge remote-tracking branch 'origin/bigann'

aerospike-community · Jul 23, 2024 · 1502152 · 1502152
2 parents 032907b + 93f04e0
commit 1502152
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 31 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -230,7 +230,7 @@
             "args": [
                     "--dataset", "gist-960-euclidean",
                     "--logfile", "./hdfquery-gist1.log",                    
-                    "-r", "1",
+                    "-r", "10",
                     "--limit", "10",                    
                     "--idxname", "ANN-data_euclidean_SQUARED_EUCLIDEAN_960_16_100_100_Idx"
                     ],
@@ -251,26 +251,15 @@
                     ],
             "justMyCode": false,
             "console": "integratedTerminal"
-        },
-        {
-            "name": "Python Debugger: bigann_download random-xs",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${workspaceFolder}/aerospike/bigann_download.py",
-            "cwd": "${workspaceFolder}/aerospike",
-            "args": [
-                    "--dataset", "random-xs"
-                    ],
-            "console": "integratedTerminal"
-        },
+        },        
         {
-            "name": "Python Debugger: bigann_download deep-10M",
+            "name": "Python Debugger: bigann_download (prompt)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/bigann_download.py",
             "cwd": "${workspaceFolder}/aerospike",
             "args": [
-                    "--dataset", "deep-10M"
+                    "--dataset", "${input:enterBigDataset}"
                     ],
             "console": "integratedTerminal"
         },

diff --git a/aerospike/AerospikeHDFDashboard.json b/aerospike/AerospikeHDFDashboard.json
@@ -923,7 +923,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", ns=\"$namespace\", set=\"$set\"}",
+          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", ns=~\"$namespace\", set=~\"$set\"}",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -997,7 +997,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}",
+          "expr": "aerospike_hdf_heartbeat{idx=~\"$idxname\", instance=~\"$client\", idxns=~\"$idxns\"}",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -1175,7 +1175,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(aerospike_hdf_populate_total{instance=~\"$client\", ns=\"$namespace\", set=\"$set\"}[$__rate_interval])",
+          "expr": "rate(aerospike_hdf_populate_total{instance=~\"$client\", ns=~\"$namespace\", set=~\"$set\"}[$__rate_interval])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1277,7 +1277,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", idxns=\"$idxns\", idx=\"$idxname\"}",
+          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", idxns=~\"$idxns\", idx=~\"$idxname\"}",
           "format": "table",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -1350,7 +1350,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", idxns=\"$idxns\", idx=\"$idxname\"}",
+          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", idxns=~\"$idxns\", idx=~\"$idxname\"}",
           "format": "table",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -1423,7 +1423,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", idxns=\"$idxns\", idx=\"$idxname\"}",
+          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", idxns=~\"$idxns\", idx=~\"$idxname\"}",
           "format": "table",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -1495,7 +1495,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", ns=\"$idxns\", idx=\"$idxname\"}",
+          "expr": "aerospike_hdf_heartbeat{instance=~\"$client\", ns=~\"$idxns\", idx=~\"$idxname\"}",
           "format": "table",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -1568,7 +1568,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}",
+          "expr": "aerospike_hdf_heartbeat{idx=~\"$idxname\", instance=~\"$client\", idxns=~\"$idxns\"}",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -1688,9 +1688,9 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
+          "editorMode": "builder",
           "exemplar": false,
-          "expr": "label_join(aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}, \"recalltype\", \"-\", \"anndist\",\"querymetric\")",
+          "expr": "label_join(aerospike_hdf_heartbeat{idx=~\"$idxname\", instance=~\"$client\", idxns=~\"$idxns\"}, \"recalltype\", \"-\", \"anndist\"-\"querymetric\")",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -1779,7 +1779,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}",
+          "expr": "aerospike_hdf_heartbeat{idx=~\"$idxname\", instance=~\"$client\", idxns=~\"$idxns\"}",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -1868,7 +1868,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}",
+          "expr": "aerospike_hdf_heartbeat{idx=~\"$idxname\", instance=~\"$client\", idxns=~\"$idxns\"}",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -1957,7 +1957,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}",
+          "expr": "aerospike_hdf_heartbeat{idx=~\"$idxname\", instance=~\"$client\", idxns=~\"$idxns\"}",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -2065,7 +2065,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "rate(aerospike_hdf_query_total{ns=\"$idxns\", idx=\"$idxname\", instance=~\"$client\", run=~\"$QueryRun\"}[$__rate_interval])",
+          "expr": "rate(aerospike_hdf_query_total{ns=~\"$idxns\", idx=~\"$idxname\", instance=~\"$client\", run=~\"$QueryRun\"}[$__rate_interval])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2166,7 +2166,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "sum by(le) (aerospike_hdf_queryhist_milliseconds_bucket{ns=\"$idxns\", idx=\"$idxname\", instance=~\"$client\", run=~\"$QueryRun\"})",
+          "expr": "sum by(le) (aerospike_hdf_queryhist_milliseconds_bucket{ns=~\"$idxns\", idx=~\"$idxname\", instance=~\"$client\", run=~\"$QueryRun\"})",
           "format": "heatmap",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -2389,6 +2389,6 @@
   "timezone": "",
   "title": "Aerospike HDF",
   "uid": "fzUPYeJIkhdf",
-  "version": 19,
+  "version": 20,
   "weekStart": ""
 }