Bring F3 up to its release branch, with both sides' store tests (part 11 of 14)
mesh/merge-gate head 6a0e6c1c0cc6 merged into trunk fcdecb436117 — fail: head 6a0e6c1c0cc6 does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/repo-check head 6a0e6c1c0cc6 merged into trunk fcdecb436117 — fail: head 6a0e6c1c0cc6 does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate head 6a0e6c1c0cc6 merged into trunk fcdecb436117 — fail: head 6a0e6c1c0cc6 does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/repo-check head 6a0e6c1c0cc6 merged into trunk fcdecb436117 — fail: head 6a0e6c1c0cc6 does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/delivery superseded: a newer head of the same pull request
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"grafana.bound-influxdb-api": {
|
||||
"content": "{\n \"as\": \"mesh_workstation_grafana\",\n \"at\": \"workstation.internal\",\n \"binding\": 1,\n \"from\": \"workstation\",\n \"generated\": \"by the mesh — do not edit; replaced whenever this changes. The credential is not here: it is sealed, in the file this module's manifest names under `secrets`\",\n \"provision\": \"influxdb-api\",\n \"serves\": {\n \"bucket\": \"made-up-bucket\",\n \"org\": \"made-up-org\",\n \"port\": 8086,\n \"scheme\": \"http\"\n }\n}\n",
|
||||
"id": "grafana.bound-influxdb-api",
|
||||
"mode": "0644",
|
||||
"path": "/var/lib/grafana/influxdb.json",
|
||||
"type": "file"
|
||||
},
|
||||
"grafana.influxdb-datasource": {
|
||||
"content": "apiVersion: 1\n# Written by the mesh from grafana's influxdb-api binding, only while it is bound (novox/hq ADR 0330):\n# without influxdb, grafana runs with no mesh data source. grafana reads it at start. Its own name and\n# uid, so a data source somebody made in the UI is never overwritten, and read-only in the UI because\n# the mesh resets it. The password is read from the file the mesh delivers, never written here.\ndatasources:\n - name: InfluxDB (mesh)\n uid: mesh-influxdb-api\n type: influxdb\n access: proxy\n url: http://workstation.internal:8086\n user: mesh_workstation_grafana\n isDefault: false\n editable: false\n jsonData:\n dbName: made-up-bucket\n httpMode: POST\n secureJsonData:\n password: $__file{/run/secrets/influxdb/influxdb-api}\n",
|
||||
"id": "grafana.influxdb-datasource",
|
||||
"mode": "0644",
|
||||
"path": "/var/lib/grafana/influxdb-datasources/mesh-influxdb.yaml",
|
||||
"type": "file"
|
||||
},
|
||||
"grafana.influxdb-datasources": {
|
||||
"id": "grafana.influxdb-datasources",
|
||||
"mode": "0755",
|
||||
"owner": "472:0",
|
||||
"path": "/var/lib/grafana/influxdb-datasources",
|
||||
"type": "directory"
|
||||
},
|
||||
"grafana.mesh-state": {
|
||||
"id": "grafana.mesh-state",
|
||||
"mode": "0700",
|
||||
"path": "/var/lib/mesh/grafana",
|
||||
"type": "directory"
|
||||
},
|
||||
"grafana.state": {
|
||||
"id": "grafana.state",
|
||||
"mode": "0700",
|
||||
"path": "/var/lib/grafana",
|
||||
"type": "directory"
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"grafana.bound-influxdb-api": {
|
||||
"content": "{\n \"as\": \"mesh_workstation_grafana\",\n \"at\": \"workstation.internal\",\n \"binding\": 1,\n \"from\": \"workstation\",\n \"generated\": \"by the mesh — do not edit; replaced whenever this changes. The credential is not here: it is sealed, in the file this module's manifest names under `secrets`\",\n \"provision\": \"influxdb-api\",\n \"serves\": {\n \"bucket\": \"default\",\n \"org\": \"mesh\",\n \"port\": 8086,\n \"scheme\": \"http\"\n }\n}\n",
|
||||
"id": "grafana.bound-influxdb-api",
|
||||
"mode": "0644",
|
||||
"path": "/var/lib/grafana/influxdb.json",
|
||||
"type": "file"
|
||||
},
|
||||
"grafana.influxdb-datasource": {
|
||||
"content": "apiVersion: 1\n# Written by the mesh from grafana's influxdb-api binding, only while it is bound (novox/hq ADR 0330):\n# without influxdb, grafana runs with no mesh data source. grafana reads it at start. Its own name and\n# uid, so a data source somebody made in the UI is never overwritten, and read-only in the UI because\n# the mesh resets it. The password is read from the file the mesh delivers, never written here.\ndatasources:\n - name: InfluxDB (mesh)\n uid: mesh-influxdb-api\n type: influxdb\n access: proxy\n url: http://workstation.internal:8086\n user: mesh_workstation_grafana\n isDefault: false\n editable: false\n jsonData:\n dbName: default\n httpMode: POST\n secureJsonData:\n password: $__file{/run/secrets/influxdb/influxdb-api}\n",
|
||||
"id": "grafana.influxdb-datasource",
|
||||
"mode": "0644",
|
||||
"path": "/var/lib/grafana/influxdb-datasources/mesh-influxdb.yaml",
|
||||
"type": "file"
|
||||
},
|
||||
"grafana.influxdb-datasources": {
|
||||
"id": "grafana.influxdb-datasources",
|
||||
"mode": "0755",
|
||||
"owner": "472:0",
|
||||
"path": "/var/lib/grafana/influxdb-datasources",
|
||||
"type": "directory"
|
||||
},
|
||||
"grafana.mesh-state": {
|
||||
"id": "grafana.mesh-state",
|
||||
"mode": "0700",
|
||||
"path": "/var/lib/mesh/grafana",
|
||||
"type": "directory"
|
||||
},
|
||||
"grafana.state": {
|
||||
"id": "grafana.state",
|
||||
"mode": "0700",
|
||||
"path": "/var/lib/grafana",
|
||||
"type": "directory"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user