Zone naming / endpoint best practice

Hey guys…

We are having a lot of zones since the beginning of our setup BUT we are facing an issue and I think it’s related to how we managed our zones!

In our zones.conf on the master we have

object Endpoint "sat01.fqdn" {
        host = "172.30.254.116"
}

object Zone "sat01.fqdn" {
  endpoints = [ "sat01.fqdn" ]

  parent = "master"
}

AND in our zones.conf in the sat01 we have

object Endpoint "master.fqdn" {
        host = "master.fqdn"
        port = "5665"
}

object Zone "master" {
        endpoints = [ "master.fqdn" ]
}

object Endpoint "sat01.fqdn" {
}

object Zone "sat01.fqdn" {
        endpoints = [ "sat01.fqdn" ]
        parent = "master"
}

object Zone "global-templates" {
        global = true
}

object Zone "director-global" {
        global = true
}

In the zones.conf of 1 agent we have

object Endpoint "sat01.fqdn" {
}

object Zone "master" {
        endpoints = [ "sat01.fqdn" ]
}

object Endpoint NodeName {
}

object Zone ZoneName {
        endpoints = [ NodeName ]
        parent = "master"
}

object Zone "global-templates" {
        global = true
}

object Zone "global-commands" {
        global = true
}

If for some reason, we need to replace OR add a new sat at the same location, we will named it

sat02.fqdn

by doing that, we would need to modify all the zones.conf on some agent to replace the sat01.fqdn

Is there a better way to handle that ? Right now we are replacing 4-5 “sat” and that means we need to change near 100 agent zone config for the new “sat” name…

thanks