Compilation results for titan2002.codfw.wmnet: System changes detected

Catalog differences

Summary

Resources only in the new catalog

• Exec[orchestrated restart needed]
• File[/etc/thanos-compact/relabel.yaml.unreferenced]
• File[/etc/systemd/system/thanos-compact.service.d]
• Class[Thanos::Compact::Prometheus]

Resources modified

• File[/etc/systemd/system/thanos-compact.service.d]

  Parameters differences:

  --- File[/etc/systemd/system/thanos-compact.service.d].orig
  +++ File[/etc/systemd/system/thanos-compact.service.d]
  
  +    ensure => directory
  +    group  => root
  +    mode   => 0555
  +    owner  => root
  

• Systemd::Unit[thanos-compact]

  Parameters differences:

  --- Systemd::Unit[thanos-compact].orig
  +++ Systemd::Unit[thanos-compact]
  
  @@
  -    ensure => absent
  +    ensure => present
  

• Class[Profile::Thanos::Compact]

  Parameters differences:

  --- Class[Profile::Thanos::Compact].orig
  +++ Class[Profile::Thanos::Compact]
  
  -    thanos_compact_host => titan2001.codfw.wmnet
  

• Service[thanos-compact]

  Parameters differences:

  --- Service[thanos-compact].orig
  +++ Service[thanos-compact]
  
  -    before => ['Exec[systemd daemon-reload for thanos-compact.service (thanos-compact)]']
  @@
  -    ensure => stopped
  +    ensure => running
  @@
  -    enable => False
  +    enable => True
  

• Systemd::Service[thanos-compact]

  Parameters differences:

  --- Systemd::Service[thanos-compact].orig
  +++ Systemd::Service[thanos-compact]
  
  @@
  -    ensure         => absent
  +    ensure         => present
  @@
  -    service_params => {'enable': False, 'hasrestart': True}
  +    service_params => {'enable': True, 'hasrestart': True}
  

• File[/etc/systemd/system/thanos-compact.service.d/puppet-override.conf]

  Parameters differences:

  --- File[/etc/systemd/system/thanos-compact.service.d/puppet-override.conf].orig
  +++ File[/etc/systemd/system/thanos-compact.service.d/puppet-override.conf]
  
  @@
  -    ensure => absent
  +    ensure => present
  

  Content differences:

  --- /etc/systemd/system/thanos-compact.service.d/puppet-override.conf.orig
  +++ /etc/systemd/system/thanos-compact.service.d/puppet-override.conf
  @@ -1,7 +1,15 @@
   [Service]
  +
  +# Local restart is blocked if a new relabel-config-file is pending deployment via the cookbook.
  +# In this case, the restart must be performed using the sre.o11y.thanos-compact-restart cookbook.
  +
   Slice=thanos.slice
   # force sigkill due to https://github.com/thanos-io/thanos/issues/6398
   SendSIGKILL=yes
  +ExecReload=
  +ExecReload=/bin/bash -c "/usr/bin/cmp -s /etc/thanos-compact/relabel.yaml.unreferenced /etc/thanos-compact/relabel.yaml && /bin/kill -HUP $MAINPID || (echo 'New relabel config file pending deployment. Restart must be performed using the sre.o11y.thanos-compact-restart cookbook.'; exit 1)"
  +ExecStartPre=
  +ExecStartPre=/bin/bash -c "/usr/bin/cmp -s /etc/thanos-compact/relabel.yaml.unreferenced /etc/thanos-compact/relabel.yaml || (echo 'New relabel config file pending deployment. Restart must be performed using the sre.o11y.thanos-compact-restart cookbook.'; exit 1)"
   ExecStart=
   ExecStart=/usr/bin/thanos compact \
     --http-address 0.0.0.0:12902 \
  @@ -15,4 +23,5 @@
     --compact.concurrency 2 \
     --downsample.concurrency 2 \
     --block-meta-fetch-concurrency 96 \
  +  --selector.relabel-config-file /etc/thanos-compact/relabel.yaml \
     --wait

• File[/etc/thanos-compact/relabel.yaml.unreferenced]

  Parameters differences:

  --- File[/etc/thanos-compact/relabel.yaml.unreferenced].orig
  +++ File[/etc/thanos-compact/relabel.yaml.unreferenced]
  
  +    ensure => file
  +    group  => root
  +    mode   => 0550
  +    owner  => thanos
  

  Content differences:

  --- /etc/thanos-compact/relabel.yaml.unreferenced.orig
  +++ /etc/thanos-compact/relabel.yaml.unreferenced
  @@ -0,0 +1,30 @@
  +# Note: "a^" is a regex that matches nothing,
  +# as "a" cannot be followed by the start of the string "^".
  +#
  +# regex: "^(a^|)$"
  +#   Used by "ruler blocks designated compactor" when there are no owned instances,
  +#   to match only Thanos Ruler generated blocks (i.e: without the prometheus label).
  +#   The trailing '|' before the final ')' is used to match an empty string
  +#   (i.e., a missing prometheus label).
  +#
  +# regex: "^(a^)$"
  +#   Used by non "ruler blocks designated compactor" when there are no owned instances,
  +#   to match nothing, as the compactor should not receive any blocks.
  +#
  +# regex: "^(instance_1|instance_2|...|)$"
  +#   Used by "ruler blocks designated compactor" when there are owned instances.
  +#   The regex matches both the owned instances and Thanos Ruler generated blocks,
  +#   as the compactor needs to receive all blocks to be able to compact them.
  +#   The trailing '|' before the final ')' is used to match an empty string
  +#   (i.e., a missing prometheus label).
  +#
  +# regex: "^(instance_1|instance_2|...)$"
  +#   Used by non "ruler blocks designated compactor" when there are owned instances.
  +#   The regex matches only the owned instances, as the compactor should not receive
  +#   Thanos Ruler generated blocks.
  +
  +- action: keep
  +  source_labels:
  +    - prometheus
  +    regex: "^(k8s-aux|k8s-dse|k8s-mlserve|k8s-mlstaging|k8s-staging)$"
  +  

• Class[Thanos::Compact]

  Parameters differences:

  --- Class[Thanos::Compact].orig
  +++ Class[Thanos::Compact]
  
  -    run_on_host => titan2001.codfw.wmnet
  

• Exec[orchestrated restart needed]

  Parameters differences:

  --- Exec[orchestrated restart needed].orig
  +++ Exec[orchestrated restart needed]
  
  +    path    => ['/bin', '/usr/bin']
  +    command => /bin/sh -c 'cmp -s "/etc/thanos-compact/relabel.yaml" "/etc/thanos-compact/relabel.yaml.unreferenced" || (echo "Please run the sre.o11y.thanos-compact-restart cookbook" >&2; exit 1)'
  +    require => ['File[/etc/thanos-compact/relabel.yaml.unreferenced]', 'File[/etc/thanos-compact/objstore.yaml]']
  

• Exec[systemd daemon-reload for thanos-compact.service (thanos-compact)]

  Parameters differences:

  --- Exec[systemd daemon-reload for thanos-compact.service (thanos-compact)].orig
  +++ Exec[systemd daemon-reload for thanos-compact.service (thanos-compact)]
  
  +    notify => ['Service[thanos-compact]']
  

Relevant files

• Production catalog
• Change catalog
• Production errors/warnings
• Change errors/warnings
• Core Diff
• Standard Diff