From 40a224dee2c60b25ce82401c6f6b558261e4f7bb Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Wed, 12 Mar 2025 09:54:09 +0100
Subject: [PATCH 1/5] add controlrestapi as a datasource
---
datasources/restcontrolserver.yaml | 39 ++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 datasources/restcontrolserver.yaml
diff --git a/datasources/restcontrolserver.yaml b/datasources/restcontrolserver.yaml
new file mode 100644
index 0000000..3944591
--- /dev/null
+++ b/datasources/restcontrolserver.yaml
@@ -0,0 +1,39 @@
+apiVersion: 1
+
+datasources:
+ # <string, required> name of the datasource. Required
+ - name: Station Control Rest Api
+ # <string, required> datasource type. Required
+ type: yesoreyeram-infinity-datasource
+ # <string, required> access mode. proxy or direct (Server or Browser in the UI). Required
+ access: proxy
+ # <int> org id. will default to orgId 1 if not specified
+ orgId: 1
+ # <string> custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically
+ uid: controlrestapi
+ # <string> url
+ url: http://controlrestapi.service.consul:50053/
+ # <string> Deprecated, use secureJsonData.password
+ password:
+ # <string> database user, if used
+ user:
+ # <string> database name, if used
+ database:
+ # <bool> enable/disable basic auth
+ basicAuth: false
+ # <string> basic auth username
+ basicAuthUser:
+ # <string> Deprecated, use secureJsonData.basicAuthPassword
+ basicAuthPassword:
+ # <bool> enable/disable with credentials headers
+ withCredentials:
+ # <bool> mark as default datasource. Max one per org
+ isDefault: false
+ # <map> fields that will be converted to json and stored in jsonData
+ jsonData:
+ # <string> json object of data that will be encrypted.
+ secureJsonData:
+ version: 1
+ # <bool> allow users to edit datasources from the UI.
+ editable: false
+
--
GitLab
From 38947aceb87b402ae0851b99d87053e76fe10b5d Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Wed, 12 Mar 2025 10:03:17 +0100
Subject: [PATCH 2/5] Commented URl + Added first prefix to it.
---
datasources/restcontrolserver.yaml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/datasources/restcontrolserver.yaml b/datasources/restcontrolserver.yaml
index 3944591..d384b17 100644
--- a/datasources/restcontrolserver.yaml
+++ b/datasources/restcontrolserver.yaml
@@ -12,7 +12,10 @@ datasources:
# <string> custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically
uid: controlrestapi
# <string> url
- url: http://controlrestapi.service.consul:50053/
+ # What we use here : http:// the consul name for the restapi / version of api / the consul address of the rpc service
+ # So that calls like "/v1/<station_name>/antenna/<antennafield_name>/<antenna_name>/use/<int:use> have the station name already filled on
+ # (The station name is used in the code to call to the Station grpc service)
+ url: http://controlrestapi.service.consul:50053/v1/rpc.service.consul/
# <string> Deprecated, use secureJsonData.password
password:
# <string> database user, if used
--
GitLab
From f2b36eab7af44d7d9741b38070169743b7951d09 Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Wed, 12 Mar 2025 13:11:00 +0100
Subject: [PATCH 3/5] update readme
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index d687277..5d22e9c 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ as configured in the `dashboards/` directory:
* Loki, at `http://loki:3100`, serving logs,
* Alerta, at `http://alerta-server:8080`, serving the Alerta HTTP API,
* Grafana, serving its own HTTP API.
+* Station Control Rest Api, serving the Control Rest Api. Currently Used for Controlling Antenna Statuses.
## Development
--
GitLab
From 4865be2ba28074c7d0cbd3d99a39bad1f15a0ac9 Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Wed, 12 Mar 2025 14:12:05 +0100
Subject: [PATCH 4/5] Update README
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5d22e9c..9669d60 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ as configured in the `dashboards/` directory:
* Loki, at `http://loki:3100`, serving logs,
* Alerta, at `http://alerta-server:8080`, serving the Alerta HTTP API,
* Grafana, serving its own HTTP API.
-* Station Control Rest Api, serving the Control Rest Api. Currently Used for Controlling Antenna Statuses.
+* Station Control Rest Api, serving the Control Rest Api. Currently Used for Controlling Antenna Statuses.
## Development
--
GitLab
From 3be6460ff90bafeb23c8de3e78ba0927c319995f Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Thu, 13 Mar 2025 14:11:00 +0100
Subject: [PATCH 5/5] rpc is now set in nomad, generalizing this code
---
datasources/restcontrolserver.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/datasources/restcontrolserver.yaml b/datasources/restcontrolserver.yaml
index d384b17..0dfedd3 100644
--- a/datasources/restcontrolserver.yaml
+++ b/datasources/restcontrolserver.yaml
@@ -15,7 +15,7 @@ datasources:
# What we use here : http:// the consul name for the restapi / version of api / the consul address of the rpc service
# So that calls like "/v1/<station_name>/antenna/<antennafield_name>/<antenna_name>/use/<int:use> have the station name already filled on
# (The station name is used in the code to call to the Station grpc service)
- url: http://controlrestapi.service.consul:50053/v1/rpc.service.consul/
+ url: http://controlrestapi.service.consul:50053/v1/
# <string> Deprecated, use secureJsonData.password
password:
# <string> database user, if used
--
GitLab