github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

kata-monitor: drop getMonitorAddress()

Browse Source 
since the shim socket path is statically defined in the containerd-shimv2
code, we don't need to retrieve the socket name from the filesystem:
construct the socket name using the containerd-shimv2 code.

Signed-off-by: Francesco Giudici <fgiudici@redhat.com>
This commit is contained in:
Francesco Giudici 2021-07-20 10:56:29 +02:00
parent 0b03d97d0b
commit 97dcc5f78a
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/pkg/kata-monitor/cri.go
View File

@ -26,8 +26,6 @@ import (
const ( const (
// unixProtocol is the network protocol of unix socket. // unixProtocol is the network protocol of unix socket.
unixProtocol = "unix" unixProtocol = "unix"
k8sContainerdNamespace = "k8s.io"
) )
// getAddressAndDialer returns the address parsed from the given endpoint and a context dialer. // getAddressAndDialer returns the address parsed from the given endpoint and a context dialer.

20
src/runtime/pkg/kata-monitor/metrics.go
View File

@ -9,15 +9,12 @@ import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"path/filepath"
"sort" "sort"
"strings" "strings"
"sync" "sync"
"time" "time"
"github.com/kata-containers/kata-containers/src/runtime/pkg/types"
mutils "github.com/kata-containers/kata-containers/src/runtime/pkg/utils" mutils "github.com/kata-containers/kata-containers/src/runtime/pkg/utils"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
@ -72,23 +69,6 @@ func registerMetrics() {
prometheus.MustRegister(scrapeDurationsHistogram) prometheus.MustRegister(scrapeDurationsHistogram)
} }
// getMonitorAddress get metrics address for a sandbox, the abstract unix socket address is saved
// in `metrics_address` with the same place of `address`.
func (km *KataMonitor) getMonitorAddress(sandboxID, runtime string) (string, error) {
path := filepath.Join("/run/containerd", types.ContainerdRuntimeTaskPath, k8sContainerdNamespace, sandboxID, "monitor_address")
if runtime == RuntimeCRIO {
path = filepath.Join("/run/containers/storage/overlay-containers", sandboxID, "userdata", "monitor_address")
}
monitorLog.WithField("path", path).Debug("get monitor address")
data, err := ioutil.ReadFile(path)
if err != nil {
return "", err
}
return string(data), nil
}
// ProcessMetricsRequest get metrics from shim/hypervisor/vm/agent and return metrics to client. // ProcessMetricsRequest get metrics from shim/hypervisor/vm/agent and return metrics to client.
func (km *KataMonitor) ProcessMetricsRequest(w http.ResponseWriter, r *http.Request) { func (km *KataMonitor) ProcessMetricsRequest(w http.ResponseWriter, r *http.Request) {
start := time.Now() start := time.Now()

9
src/runtime/pkg/kata-monitor/pprof.go
View File

@ -11,6 +11,8 @@ import (
"io" "io"
"net" "net"
"net/http" "net/http"
shim "github.com/kata-containers/kata-containers/src/runtime/containerd-shim-v2"
) )
func serveError(w http.ResponseWriter, status int, txt string) { func serveError(w http.ResponseWriter, status int, txt string) {
@ -27,12 +29,7 @@ func (km *KataMonitor) composeSocketAddress(r *http.Request) (string, error) {
return "", err return "", err
} }
runtime, err := km.getSandboxRuntime(sandbox) return shim.SocketAddress(sandbox), nil
if err != nil {
return "", err
}
return km.getMonitorAddress(sandbox, runtime)
} }
func (km *KataMonitor) proxyRequest(w http.ResponseWriter, r *http.Request) { func (km *KataMonitor) proxyRequest(w http.ResponseWriter, r *http.Request) {