Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: adjust port name to number port (#7804) #7825

Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions pkg/common/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ limitations under the License.
package common

import (
"strconv"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"

appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
)
Expand All @@ -41,15 +44,39 @@ func FromScrapePath(exporter appsv1alpha1.Exporter) string {
return defaultScrapePath
}

func getPortNumberFromContainer(portName string, container *corev1.Container) string {
if container == nil || portName == "" {
return portName
}
for _, port := range container.Ports {
if port.Name == portName {
return strconv.Itoa(int(port.ContainerPort))
}
}
// Compatible with number ports.
return portName
}

func FromContainerPort(exporter Exporter, container *corev1.Container) string {
if exporter.ScrapePort != "" {
return exporter.ScrapePort
convertPort := func(port intstr.IntOrString) string {
sophon-zt marked this conversation as resolved.
Show resolved Hide resolved
switch {
case port.StrVal == "":
return getPortNumberFromContainer(exporter.TargetPort.StrVal, container)
case port.IntVal != 0:
return strconv.Itoa(int(exporter.TargetPort.IntVal))
default:
return ""
}
}
if container != nil && len(container.Ports) > 0 {
return container.Ports[0].Name

if exporter.ScrapePort != "" {
sophon-zt marked this conversation as resolved.
Show resolved Hide resolved
return getPortNumberFromContainer(exporter.ScrapePort, container)
}
if exporter.TargetPort != nil {
sophon-zt marked this conversation as resolved.
Show resolved Hide resolved
return exporter.TargetPort.String()
return convertPort(*exporter.TargetPort)
}
if container != nil && len(container.Ports) > 0 {
return strconv.Itoa(int(container.Ports[0].ContainerPort))
weicao marked this conversation as resolved.
Show resolved Hide resolved
}
return ""
}
Expand Down
Loading