servicey collector

.github/workflows/servicex.yaml → .github/workflows/servicey.yaml

@@ -1,9 +1,9 @@
-name: Build servicex Logstash dockerhub image
+name: Build servicey Logstash dockerhub image
 
 on:
   push:
     branches:
-      - "servicex"
+      - "servicey"
 
 jobs:
   docker:
@@ -15,8 +15,8 @@ jobs:
       - name: Docker Build & Push Action
         uses: mr-smithers-excellent/[email protected]
         with:
-          image: atlasanalyticsservice/uc_ls_servicex
-          dockerfile: Dockerfile.servicex
+          image: atlasanalyticsservice/uc_ls_servicey
+          dockerfile: Dockerfile.servicey
           tags: latest, ${{ github.sha }}
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -27,5 +27,5 @@ jobs:
         with:
           token: ${{ secrets.AAAS_GITOPS_DEPLOY_TRIGGER }}
           repository: maniaclab/flux_apps
-          event-type: gitops-uc-ls-servicex-app-trigger
+          event-type: gitops-uc-ls-servicey-app-trigger
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

Dockerfile.servicex → Dockerfile.servicey

@@ -13,9 +13,9 @@ RUN mkdir /var/log/logstash && chown -R logstash /var/log/logstash
 
 COPY logstash.yml /usr/share/logstash/config/logstash.yml
 
-COPY configs/servicex.conf /usr/share/logstash/configs/servicex.conf
+COPY configs/servicey.conf /usr/share/logstash/configs/servicey.conf
 
-COPY pipelines/servicex.yml /usr/share/logstash/config/pipelines.yml
+COPY pipelines/servicey.yml /usr/share/logstash/config/pipelines.yml
 
 # COPY filters/* /usr/share/logstash/filters/
 

README.md

@@ -1,3 +1,3 @@
-# ServiceX logstash collector to run at UC
+# ServiceY logstash collector to run at UC
 
-[![Build ServiceX Logstash dockerhub image](https://github.com/ATLAS-Analytics/uc_ls_collectors/actions/workflows/servicex.yaml/badge.svg)](https://github.com/ATLAS-Analytics/uc_ls_collectors/actions/workflows/servicex.yaml)
+[![Build ServiceY Logstash dockerhub image](https://github.com/ATLAS-Analytics/uc_ls_collectors/actions/workflows/servicey.yaml/badge.svg)](https://github.com/ATLAS-Analytics/uc_ls_collectors/actions/workflows/servicey.yaml)

configs/servicex.conf → configs/servicey.conf

@@ -1,11 +1,7 @@
 input {
-  tcp {
-    # host => "0.0.0.0"
-    port => 5959
-    codec => "json"
-    ssl_client_authentication => none
-    dns_reverse_lookup_enabled => false
-    tcp_keep_alive => true
+  udp {
+    port => 5044
+    codec => json
   }
 }
 
@@ -30,7 +26,7 @@ output {
   elasticsearch {
     hosts => "atlas-kibana.mwt2.org"
     ssl => true
-    index => 'servicex-%{+YYYY-MM}'
+    index => 'servicey-%{+YYYY-MM}'
     user => "uc_logstash_indexer"
     password => "${LOGSTASH_PWD}"
   }

pipelines/servicey.yml

@@ -0,0 +1,5 @@
+- pipeline.id: servicey
+  path.config: "/usr/share/logstash/configs/servicey.conf"
+  pipeline.workers: 1
+#   queue.type: persisted
+#   queue.max_bytes: 4gb

tester.py

@@ -5,8 +5,7 @@
 test_logger = logging.getLogger('test-ilija')
 
 test_logger.setLevel(logging.INFO)
-# test_logger.addHandler(logstash.LogstashHandler('servicex.atlas-ml.org', 5959, version=1))
-test_logger.addHandler(logstash.TCPLogstashHandler('servicex.atlas-ml.org', 5959, version=1))
+test_logger.addHandler(logstash.LogstashHandler('servicey.atlas-ml.org', 5044, version=1))
 
 test_logger.error('python-logstash: test logstash error message.')
 test_logger.info('python-logstash: test logstash info message.')