Skip to content
Snippets Groups Projects
Commit b18f8398 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'L2SS-2313-ping-devices' into 'master'

Resolve L2SS-2313 "Ping devices"

Closes L2SS-2313

See merge request !1101
parents 7a5ee44c 8e91d3a0
Branches
Tags v0.51.4
1 merge request!1101Resolve L2SS-2313 "Ping devices"
Pipeline #118402 failed
Pipeline: tango

#118456

    Pipeline: tango

    #118403

      ...@@ -49,7 +49,7 @@ include: ...@@ -49,7 +49,7 @@ include:
      # only disregard them. As such, additional # only disregard them. As such, additional
      # rules are always needed, either to filter # rules are always needed, either to filter
      # further or to always accept. # further or to always accept.
      - if: $CI_PIPELINE_SOURCE == "pipeline" - if: $CI_PIPELINE_SOURCE == "pipeline" && $STATION != ""
      when: never when: never
      # Prepare image to run ci on # Prepare image to run ci on
      ...@@ -85,7 +85,7 @@ run_shellcheck: ...@@ -85,7 +85,7 @@ run_shellcheck:
      LOFAR1_STATIONS: cs002 cs003 cs004 cs005 cs006 cs007 cs011 cs013 cs017 cs021 cs024 cs026 cs028 cs030 cs031 cs101 cs103 cs201 cs301 cs302 cs401 cs501 rs106 rs205 rs208 rs210 rs305 rs306 rs310 rs406 rs407 rs409 rs503 rs508 rs509 LOFAR1_STATIONS: cs002 cs003 cs004 cs005 cs006 cs007 cs011 cs013 cs017 cs021 cs024 cs026 cs028 cs030 cs031 cs101 cs103 cs201 cs301 cs302 cs401 cs501 rs106 rs205 rs208 rs210 rs305 rs306 rs310 rs406 rs407 rs409 rs503 rs508 rs509
      LOFAR2_STATIONS: cs001 cs032 rs307 LOFAR2_STATIONS: cs001 cs032 rs307
      DEV_STATIONS: dts-lab DEV_STATIONS: dts-lab
      COMPONENTS: mesh-gateway monitoring logging tango object-storage object-replication sdptr device-server dsconfig ec-sim jupyter snmp-exporter landing-page rpc-server COMPONENTS: mesh-gateway monitoring logging tango object-storage object-replication sdptr device-server dsconfig ec-sim jupyter network-monitoring landing-page rpc-server
      # Generate the station-specific TangoDB configuration based on LOFAR1 information. # Generate the station-specific TangoDB configuration based on LOFAR1 information.
      # Run manually to bootstrap CDB/stations/$station.json for stations # Run manually to bootstrap CDB/stations/$station.json for stations
      ...@@ -666,7 +666,7 @@ deploy_auto: ...@@ -666,7 +666,7 @@ deploy_auto:
      stage: deploy stage: deploy
      extends: .components extends: .components
      rules: rules:
      - if: $CI_PIPELINE_SOURCE == "pipeline" - if: $CI_PIPELINE_SOURCE == "pipeline" && $STATION != ""
      variables: variables:
      PARENT_PIPELINE_ID: $CI_PIPELINE_ID PARENT_PIPELINE_ID: $CI_PIPELINE_ID
      trigger: trigger:
      ......
      ...@@ -150,6 +150,8 @@ Next change the version in the following places: ...@@ -150,6 +150,8 @@ Next change the version in the following places:
      through [https://git.astron.nl/lofar2.0/tango/-/tags](Deploy Tags) through [https://git.astron.nl/lofar2.0/tango/-/tags](Deploy Tags)
      # Release Notes # Release Notes
      * 0.51.4 Ping FPGAs and PIs as part of monitoring
      * 0.51.3 Mirror central calibration tables into Calibration device using a volume and sync nomad job.
      * 0.51.3 Mirror central calibration tables into Calibration device using a volume and sync nomad job. * 0.51.3 Mirror central calibration tables into Calibration device using a volume and sync nomad job.
      * 0.51.2 Allow automated deployment from a multi-project pipeline in Gitlab CI/CD * 0.51.2 Allow automated deployment from a multi-project pipeline in Gitlab CI/CD
      * 0.51.1 Generate caltables from LOFAR1 data or by generating dummies * 0.51.1 Generate caltables from LOFAR1 data or by generating dummies
      ......
      ...@@ -4,9 +4,48 @@ sdptr: ...@@ -4,9 +4,48 @@ sdptr:
      lba: lba:
      first_gn: 0 first_gn: 0
      fpgas: 16 fpgas: 16
      ips:
      - 10.99.0.1
      - 10.99.0.2
      - 10.99.0.3
      - 10.99.0.4
      - 10.99.1.1
      - 10.99.1.2
      - 10.99.1.3
      - 10.99.1.4
      - 10.99.2.1
      - 10.99.2.2
      - 10.99.2.3
      - 10.99.2.4
      - 10.99.3.1
      - 10.99.3.2
      - 10.99.3.3
      - 10.99.3.4
      hba0: hba0:
      first_gn: 16 first_gn: 16
      fpgas: 4 fpgas: 4
      ips:
      - 10.99.4.1
      - 10.99.4.2
      - 10.99.4.3
      - 10.99.4.4
      hba1: hba1:
      first_gn: 20 first_gn: 20
      fpgas: 4 fpgas: 4
      ips:
      - 10.99.5.1
      - 10.99.5.2
      - 10.99.5.3
      - 10.99.5.4
      pi:
      instances:
      l0:
      ip: 10.99.0.100
      l1:
      ip: 10.99.1.100
      h0:
      ip: 10.99.2.100
      ccd:
      ip: 10.99.250.90
      ...@@ -4,6 +4,44 @@ sdptr: ...@@ -4,6 +4,44 @@ sdptr:
      lba: lba:
      first_gn: 0 first_gn: 0
      fpgas: 16 fpgas: 16
      ips:
      - 10.99.0.1
      - 10.99.0.2
      - 10.99.0.3
      - 10.99.0.4
      - 10.99.1.1
      - 10.99.1.2
      - 10.99.1.3
      - 10.99.1.4
      - 10.99.2.1
      - 10.99.2.2
      - 10.99.2.3
      - 10.99.2.4
      - 10.99.3.1
      - 10.99.3.2
      - 10.99.3.3
      - 10.99.3.4
      hba: hba:
      first_gn: 16 first_gn: 16
      fpgas: 8 fpgas: 8
      ips:
      - 10.99.4.1
      - 10.99.4.2
      - 10.99.4.3
      - 10.99.4.4
      - 10.99.5.1
      - 10.99.5.2
      - 10.99.5.3
      - 10.99.5.4
      pi:
      instances:
      l0:
      ip: 10.99.0.100
      l1:
      ip: 10.99.1.100
      h0:
      ip: 10.99.2.100
      ccd:
      ip: 10.99.250.90
      job "snmp-exporter" { job "network-monitoring" {
      region = "[[.region]]" region = "[[.region]]"
      datacenters = ["stat"] datacenters = ["stat"]
      type = "service" type = "service"
      ...@@ -37,4 +37,58 @@ job "snmp-exporter" { ...@@ -37,4 +37,58 @@ job "snmp-exporter" {
      } }
      } }
      } }
      group "ping-exporter" {
      count = 1
      network {
      mode = "cni/station"
      }
      service {
      tags = ["scrape"]
      name = "ping-exporter"
      port = "9427"
      address_mode = "alloc"
      }
      task "ping-exporter" {
      driver = "docker"
      config {
      image = "czerwonk/ping_exporter:latest"
      cap_add = ["net_raw"]
      args = ["./ping_exporter", "--config.path=/local/config.yml"]
      }
      resources {
      cpu = 100
      memory = 100
      }
      template {
      destination = "local/config.yml"
      data = <<EOF
      targets:
      [[ range $name, $sdp := $.sdptr.instances ]]
      [[ range $ip := $sdp.ips ]]
      - "[[ $ip ]]":
      type: "sdp-fpga"
      name: "[[ $name ]]"
      [[ end ]]
      [[ end ]]
      [[ range $name, $pi := $.pi.instances ]]
      - "[[ $pi.ip ]]":
      type: "pi"
      name: "[[ $name ]]"
      [[ end ]]
      {{range services}}{{ if and (in .Tags "snmp-scrape") (.Name | contains "sidecar" | not) }}
      - "{{ .Address }}":
      type: "snmp"
      name: "{{ .Name }}"
      {{ end }}{{ end }}
      EOF
      }
      }
      }
      } }
      0.51.3 0.51.4
      0% Loading or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Please register or to comment