diff --git a/epics/css/ArchiveConfigTool/isttok.ini b/epics/css/ArchiveConfigTool/isttok.ini index cc46f69..d750647 100644 --- a/epics/css/ArchiveConfigTool/isttok.ini +++ b/epics/css/ArchiveConfigTool/isttok.ini @@ -6,5 +6,5 @@ org.csstudio.archive/url=jdbc:mysql://localhost/archive?rewriteBatchedStatements # RDB user and password # Some applications also provide command-line option to override. -org.csstudio.archive/user=archive -org.csstudio.archive/password=$archive +org.csstudio.archive/user=isttok +org.csstudio.archive/password=0p3rT0k diff --git a/epics/css/epics-css-archive-isttok.service b/epics/css/epics-css-archive-isttok.service new file mode 100644 index 0000000..7904676 --- /dev/null +++ b/epics/css/epics-css-archive-isttok.service @@ -0,0 +1,26 @@ +[Unit] +Description=EPICS CSS-Archive engine for ISTTOK Machine control +# After=network.target remote-fs.target +# Requires=network.target +After=network.target + +[Service] +Type=simple +# Environment="EPICS_CA_ADDR_LIST=192.168.0.255" +# Environment="EPICS_AUTO_CA_ADDR_LIST=NO" +WorkingDirectory=/home/bernardo/git-repos/ISTTOK/epics/css +## EPICS IOC telnet port is usually 4051, this archive uses 4052 +ExecStart=/usr/bin/procServ --foreground --quiet --port=4052 /home/bernardo/git-repos/ISTTOK/epics/css/start-epics-archive.sh +User=bernardo +RuntimeDirectory=epics-css-archive-isttok +StandardOutput=syslog +StandardError=inherit +SyslogIdentifier=procserv-css-archive + +[Install] +WantedBy=multi-user.target +# telnet localhost 4052 +# Connected to localhost. +# Escape character is '^]'. (Ctrl + AltGr + ]) +# Ctrl + D +# > quit diff --git a/epics/css/ArchiveConfigTool/get_tracelog.sh b/epics/css/get_tracelog.sh similarity index 71% rename from epics/css/ArchiveConfigTool/get_tracelog.sh rename to epics/css/get_tracelog.sh index 1a3c8d9..eaf2981 100755 --- a/epics/css/ArchiveConfigTool/get_tracelog.sh +++ b/epics/css/get_tracelog.sh @@ -2,7 +2,7 @@ #mysql -u report -p"\$report" -D archive -e 'SELECT `smpl_time`, `severity_id`, `status_id`, `str_val` FROM `sample` WHERE `channel_id` = 12' #mysql -u report -p"\$report" -D archive <<< 'show tables' #mysql -u report -p"\$report" -D archive <<< "SELECT `smpl_time`, `severity_id`, `status_id`, `str_val` FROM `sample` WHERE `channel_id` = 13" -mysql -u report -p"\$report" -D archive <<< 'SELECT `smpl_time`, `str_val` , `severity_id`, `status_id` FROM sample WHERE channel_id = 12 ORDER by `smpl_time` DESC LIMIT 20' +mysql -u report -p"\$report" -D isttok_archiveDB <<< 'SELECT `smpl_time`, `str_val` , `severity_id`, `status_id` FROM sample WHERE channel_id = 12 ORDER by `smpl_time` DESC LIMIT 20' #"SELECT `smpl_time`, `severity_id`, `status_id`, `str_val` FROM `sample` WHERE `channel_id` = 13" diff --git a/epics/css/isttok.ini b/epics/css/isttok.ini new file mode 100644 index 0000000..3e9bf6c --- /dev/null +++ b/epics/css/isttok.ini @@ -0,0 +1,29 @@ +# make a link to this file in the archive-engine instalation folder. eg. +# ln -s ~/git-repos/ISTTOK/epics/css/isttok.ini /opt/epics/archive-engine/ +# ------------------------- +# Package org.phoebus.pv.ca +# ------------------------- +# Channel Access address list +# org.phoebus.pv.ca/addr_list=192.168.1.255 +org.phoebus.pv.ca/addr_list=192.168.1.110 192.168.1.152 +org.phoebus.pv.ca/auto_addr_list=false + +# ------------------------- +# Package org.phoebus.pv.pva +# ------------------------- +# PVAccess address list +org.phoebus.pv.pva/epics_pva_addr_list=192.168.1.110 192.168.1.152 +# PVAccess auto address list - true/false +org.phoebus.pv.pva/epics_pva_auto_addr_list=false + +# ---------------------------- +# Package org.csstudio.archive +# ---------------------------- +# MySQL DB access +org.csstudio.archive/url=jdbc:mysql://localhost/isttok_archiveDB?rewriteBatchedStatements=true + +# RDB user and password +# Some applications also provide command-line option to override. +org.csstudio.archive/user=isttok +org.csstudio.archive/password=0p3rT0k + diff --git a/epics/css/replace-epics-archive-engine.sh b/epics/css/replace-epics-archive-engine.sh new file mode 100755 index 0000000..2b2153f --- /dev/null +++ b/epics/css/replace-epics-archive-engine.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +TOP="/opt/epics/archive-engine" +cd $TOP +#JAR=`echo "${TOP}/service-archive-engine-*.jar"` +JAR=$(ls service-archive-engine-*.jar) +#$JAVA_HOME/bin/java -jar $JAR $OPT "$@" +$JAVA_HOME/bin/java -jar $JAR -import /home/bernardo/git-repos/ISTTOK/epics/css/xml/isttokcontrol.xml -replace_engine -engine isttokDB -port 4812 -settings isttok.ini + + + diff --git a/epics/css/start-epics-archive.sh b/epics/css/start-epics-archive.sh new file mode 100755 index 0000000..2cd481f --- /dev/null +++ b/epics/css/start-epics-archive.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# +JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +TOP="/opt/epics/archive-engine" +cd $TOP +#JAR=`echo "${TOP}/service-archive-engine-*.jar"` +JAR=$(ls service-archive-engine-*.jar) +#$JAVA_HOME/bin/java -jar $JAR $OPT "$@" +$JAVA_HOME/bin/java -jar $JAR -engine isttokDB -port 4812 -settings isttok.ini -noshell + +#sleep 2s +#echo "Archive Started. Check browser at http://localhost:4812/main" + + diff --git a/epics/css/ArchiveConfigTool/xml/isttokcontrol.xml b/epics/css/xml/isttokcontrol.xml similarity index 75% rename from epics/css/ArchiveConfigTool/xml/isttokcontrol.xml rename to epics/css/xml/isttokcontrol.xml index fef703f..b447d28 100644 --- a/epics/css/ArchiveConfigTool/xml/isttokcontrol.xml +++ b/epics/css/xml/isttokcontrol.xml @@ -2,42 +2,46 @@ - ISTTOKcontrol + ISTTOKcontrol ISTTOK:central:VVessel-Pressure - 00:01:00 + 00:01:00 ISTTOK:central:TMPump1-PressureAdmission - 00:01:00 + 00:01:00 ISTTOK:central:RPump1-Pressure - 00:01:00 + 00:01:00 ISTTOK:central:RPump2-Pressure - 00:01:00 + 00:01:00 ISTTOK:central:PULSE-NUMBER - 00:10:00 + 00:10:00 ISTTOK:central:LogMessage - 00:10:00 + 00:10:00 ISTTOK:central:TraceMessage - 00:10:00 + 00:10:00 ISTTOK:temperature:VVessel-Temperature - 00:02:00 - 1.0 + 00:02:00 + 1.0 ISTTOK:central:OPSTATE - 00:10:00 - + 00:10:00 + + ISTTOK:central:Archive-Enable + 00:10:00 +