From 344e1e52b28da664601a397f654f6d5607790f23 Mon Sep 17 00:00:00 2001 From: Jacqueline Garrahan Date: Tue, 14 Sep 2021 16:32:13 -0700 Subject: [PATCH 1/2] Update docs to source envs64 --- docs/demo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/demo.md b/docs/demo.md index 60537e1..4327da7 100644 --- a/docs/demo.md +++ b/docs/demo.md @@ -52,6 +52,7 @@ If the service containers have already been deployed, you can access cruise cont ``` +$ source /afs/slac/g/lcls/tools/script/ENVS64.bash $ source ${PACKAGE_TOP}/nalms/setup/aird-b50-srv01/demo.env $ nalms start-phoebus-client Demo ``` From 6e6c4240b80c6bbd7ad180b2f6d4e928131acb1f Mon Sep 17 00:00:00 2001 From: Jacqueline Garrahan Date: Thu, 30 Sep 2021 15:30:20 -0700 Subject: [PATCH 2/2] Increment in advance of new release --- docker-compose.yml | 20 ++++++++++---------- docs/development.md | 16 ++++++++-------- examples/demo/demo.env | 14 +++++++------- examples/heart_of_gold/heart_of_gold.env | 14 +++++++------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 519cd53..2627cca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.0" services: zookeeper: - image: jgarrahan/nalms-zookeeper:v0.7 + image: jgarrahan/nalms-zookeeper:v0.8 ports: - "2181:2181" environment: @@ -9,7 +9,7 @@ services: volumes: - "./examples/demo/config/zoo.cfg:/tmp/zoo.cfg" kafka: - image: jgarrahan/nalms-kafka:v0.7 + image: jgarrahan/nalms-kafka:v0.8 depends_on: - zookeeper ports: @@ -31,7 +31,7 @@ services: reservations: memory: 8G kafka1: - image: jgarrahan/nalms-kafka:v0.7 + image: jgarrahan/nalms-kafka:v0.8 depends_on: - zookeeper ports: @@ -53,7 +53,7 @@ services: reservations: memory: 8G kafka2: - image: jgarrahan/nalms-kafka:v0.7 + image: jgarrahan/nalms-kafka:v0.8 depends_on: - zookeeper ports: @@ -75,7 +75,7 @@ services: reservations: memory: 8G phoebus-alarm-server: - image: jgarrahan/nalms-phoebus-alarm-server:v0.7 + image: jgarrahan/nalms-phoebus-alarm-server:v0.8 links: - kafka - example-ioc @@ -93,7 +93,7 @@ services: EPICS_CA_REPEATER_PORT: 5065 ALARM_SERVER_PROPERTIES: "/opt/nalms/config/alarm_server.properties" elasticsearch: - image: jgarrahan/nalms-elasticsearch:v0.7 + image: jgarrahan/nalms-elasticsearch:v0.8 ports: - "9200:9200" volumes: @@ -108,7 +108,7 @@ services: KAFKA_HOST: kafka KAFKA_PORT: 9092 grafana: - image: jgarrahan/nalms-grafana:v0.7 + image: jgarrahan/nalms-grafana:v0.8 ports: - '3000:3000' links: @@ -122,7 +122,7 @@ services: ES_HOST: elasticsearch ES_PORT: 9200 phoebus-alarm-logger: - image: jgarrahan/nalms-phoebus-alarm-logger:v0.7 + image: jgarrahan/nalms-phoebus-alarm-logger:v0.8 links: - elasticsearch depends_on: @@ -139,7 +139,7 @@ services: - "./examples/heart_of_gold/config/alarm_logger.properties:/opt/nalms/config/alarm_logger.properties" command: start-logger HeartOfGold /tmp/nalms/heart_of_gold.xml example-ioc: - image: jgarrahan/nalms-example-ioc:v0.7 + image: jgarrahan/nalms-example-ioc:v0.8 ports: - "5075:5065/tcp" - "5074:5064/tcp" @@ -149,7 +149,7 @@ services: EPICS_CA_SERVER_PORT: 5064 EPICS_CA_REPEATER_PORT: 5065 cruise-control: - image: jgarrahan/nalms-cruise-control:v0.7 + image: jgarrahan/nalms-cruise-control:v0.8 ports: - "9090:9090" environment: diff --git a/docs/development.md b/docs/development.md index 4663a46..03402aa 100644 --- a/docs/development.md +++ b/docs/development.md @@ -15,13 +15,13 @@ Newer versioned releases should be indicated to the nalms package by updates to ``` # versions -export NALMS_DOCKER_ES_VERSION=v0.6 -export NALMS_DOCKER_GRAFANA_VERSION=v0.6 -export NALMS_DOCKER_ALARM_SERVER_VERSION=v0.6 -export NALMS_DOCKER_ALARM_LOGGER_VERSION=v0.6 -export NALMS_DOCKER_ZOOKEEPER_VERSION=v0.6 -export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v0.6 -export NALMS_DOCKER_KAFKA_VERSION=v0.6 +export NALMS_DOCKER_ES_VERSION=v0.8 +export NALMS_DOCKER_GRAFANA_VERSION=v0.8 +export NALMS_DOCKER_ALARM_SERVER_VERSION=v0.8 +export NALMS_DOCKER_ALARM_LOGGER_VERSION=v0.8 +export NALMS_DOCKER_ZOOKEEPER_VERSION=v0.8 +export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v0.8 +export NALMS_DOCKER_KAFKA_VERSION=v0.8 ``` @@ -94,4 +94,4 @@ In order to use the Grafana dashboard with a scaling number of configurations, a For further development of the dashboard, the template must be changed using a local Grafana instance. Steps for updating are: * Copy json representation * Remove id from the json representation -* Replace datasource and configuration name entries from json representation \ No newline at end of file +* Replace datasource name entries from json representation with environment var placeholder $DATASOURCE_NAME \ No newline at end of file diff --git a/examples/demo/demo.env b/examples/demo/demo.env index c6b83fc..3b2a244 100644 --- a/examples/demo/demo.env +++ b/examples/demo/demo.env @@ -28,10 +28,10 @@ export NALMS_ZOOKEEPER_HOST=$HOST_IP export NALMS_KAFKA_HOST=$HOST_IP # versions -export NALMS_DOCKER_ES_VERSION=v0.5 -export NALMS_DOCKER_GRAFANA_VERSION=v0.5 -export NALMS_DOCKER_ALARM_SERVER_VERSION=v0.5 -export NALMS_DOCKER_ALARM_LOGGER_VERSION=v0.5 -export NALMS_DOCKER_ZOOKEEPER_VERSION=v0.5 -export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v0.5 -export NALMS_DOCKER_KAFKA_VERSION=v0.5 +export NALMS_DOCKER_ES_VERSION=v0.8 +export NALMS_DOCKER_GRAFANA_VERSION=v0.8 +export NALMS_DOCKER_ALARM_SERVER_VERSION=v0.8 +export NALMS_DOCKER_ALARM_LOGGER_VERSION=v0.8 +export NALMS_DOCKER_ZOOKEEPER_VERSION=v0.8 +export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v0.8 +export NALMS_DOCKER_KAFKA_VERSION=v0.8 diff --git a/examples/heart_of_gold/heart_of_gold.env b/examples/heart_of_gold/heart_of_gold.env index 9650b7c..a921612 100644 --- a/examples/heart_of_gold/heart_of_gold.env +++ b/examples/heart_of_gold/heart_of_gold.env @@ -28,11 +28,11 @@ export NALMS_ZOOKEEPER_HOST=zookeeper export NALMS_KAFKA_HOST=kafka1 # versions -export NALMS_DOCKER_ES_VERSION=v0.5 -export NALMS_DOCKER_GRAFANA_VERSION=v0.5 -export NALMS_DOCKER_ALARM_SERVER_VERSION=v0.5 -export NALMS_DOCKER_ALARM_LOGGER_VERSION=v0.5 -export NALMS_DOCKER_ZOOKEEPER_VERSION=v0.5 -export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v0.5 -export NALMS_DOCKER_KAFKA_VERSION=v0.5 +export NALMS_DOCKER_ES_VERSION=v0.8 +export NALMS_DOCKER_GRAFANA_VERSION=v0.8 +export NALMS_DOCKER_ALARM_SERVER_VERSION=v0.8 +export NALMS_DOCKER_ALARM_LOGGER_VERSION=v0.8 +export NALMS_DOCKER_ZOOKEEPER_VERSION=v0.8 +export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v0.8 +export NALMS_DOCKER_KAFKA_VERSION=v0.8