Skip to content

Commit

Permalink
Merge pull request #92 from jacquelinegarrahan/misc-cleanup
Browse files Browse the repository at this point in the history 
Misc cleanup and version increment
  • Loading branch information
@jacquelinegarrahan
jacquelinegarrahan authored Sep 30, 2021
2 parents da31e86 + 6e6c424 commit 2740968
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 32 deletions.
20 changes: 10 additions & 10 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
version: "3.0"
services:
zookeeper:
image: jgarrahan/nalms-zookeeper:v0.7
image: jgarrahan/nalms-zookeeper:v0.8
ports:
- "2181:2181"
environment:
ZOOKEEPER_CONFIG: /tmp/zoo.cfg
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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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"
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions docs/demo.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
16 changes: 8 additions & 8 deletions docs/development.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```


Expand Down Expand Up @@ -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
* Replace datasource name entries from json representation with environment var placeholder $DATASOURCE_NAME
14 changes: 7 additions & 7 deletions examples/demo/demo.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions examples/heart_of_gold/heart_of_gold.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 2740968

Please sign in to comment.