github/node-problem-detector
1
0
Fork 0
mirror of https://github.com/kubernetes/node-problem-detector.git synced 2026-03-02 01:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #760 from MartinForReal/master

Browse Source 
bump k8s.io dependencies to 1.17.2
This commit is contained in:
Kubernetes Prow Robot
2023-06-25 21:41:16 -07:00
committed by GitHub
parent 6e30b17476 b5e4ef628b
commit e6fbdd434a
1861 changed files with 443810 additions and 149092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/exporters/k8sexporter/problemclient/problem_client.go
View File

@@ -23,17 +23,16 @@ import (
"os"
"path/filepath"
typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"github.com/golang/glog"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/clock"
clientset "k8s.io/client-go/kubernetes"
typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/record"
"github.com/golang/glog"
"k8s.io/node-problem-detector/cmd/options"
"k8s.io/node-problem-detector/pkg/version"
)
@@ -137,7 +136,7 @@ func generatePatch(conditions []v1.NodeCondition) ([]byte, error) {
func getEventRecorder(c typedcorev1.CoreV1Interface, namespace, nodeName, source string) record.EventRecorder {
eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(glog.V(4).Infof)
recorder := eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: source, Host: nodeName})
recorder := eventBroadcaster.NewRecorder(runtime.NewScheme(), v1.EventSource{Component: source, Host: nodeName})
eventBroadcaster.StartRecordingToSink(&typedcorev1.EventSinkImpl{Interface: c.Events(namespace)})
return recorder
}

1
pkg/exporters/stackdriver/stackdriver_exporter_test.go
View File

@@ -1,3 +1,4 @@
//go:build !disable_stackdriver_exporter
// +build !disable_stackdriver_exporter
/*

1
pkg/logcounter/log_counter.go
View File

@@ -1,3 +1,4 @@
//go:build journald
// +build journald
/*

1
pkg/logcounter/log_counter_test.go
View File

@@ -1,3 +1,4 @@
//go:build journald
// +build journald
/*

1
pkg/systemlogmonitor/logwatchers/journald/log_watcher_test.go
View File

@@ -1,3 +1,4 @@
//go:build journald
// +build journald
/*

1
pkg/systemlogmonitor/logwatchers/register_journald.go
View File

@@ -1,3 +1,4 @@
//go:build journald
// +build journald
/*

50
pkg/systemstatsmonitor/memory_collector_linux.go
View File

@@ -38,30 +38,52 @@ func (mc *memoryCollector) collect() {
}
if mc.mBytesUsed != nil {
memUsed := meminfo.MemTotal - meminfo.MemFree - meminfo.Buffers - meminfo.Cached - meminfo.Slab
mc.mBytesUsed.Record(map[string]string{stateLabel: "free"}, int64(meminfo.MemFree)*1024)
mc.mBytesUsed.Record(map[string]string{stateLabel: "used"}, int64(memUsed)*1024)
mc.mBytesUsed.Record(map[string]string{stateLabel: "buffered"}, int64(meminfo.Buffers)*1024)
mc.mBytesUsed.Record(map[string]string{stateLabel: "cached"}, int64(meminfo.Cached)*1024)
mc.mBytesUsed.Record(map[string]string{stateLabel: "slab"}, int64(meminfo.Slab)*1024)
if meminfo.MemFree != nil {
mc.mBytesUsed.Record(map[string]string{stateLabel: "free"}, int64(*meminfo.MemFree)*1024)
}
if meminfo.Buffers != nil {
mc.mBytesUsed.Record(map[string]string{stateLabel: "buffered"}, int64(*meminfo.Buffers)*1024)
}
if meminfo.Cached != nil {
mc.mBytesUsed.Record(map[string]string{stateLabel: "cached"}, int64(*meminfo.Cached)*1024)
}
if meminfo.Slab != nil {
mc.mBytesUsed.Record(map[string]string{stateLabel: "slab"}, int64(*meminfo.Slab)*1024)
}
if meminfo.MemTotal != nil && meminfo.MemFree != nil && meminfo.Buffers != nil && meminfo.Cached != nil && meminfo.Slab != nil {
memUsed := *meminfo.MemTotal - *meminfo.MemFree - *meminfo.Buffers - *meminfo.Cached - *meminfo.Slab
mc.mBytesUsed.Record(map[string]string{stateLabel: "used"}, int64(memUsed)*1024)
}
}
if mc.mDirtyUsed != nil {
mc.mDirtyUsed.Record(map[string]string{stateLabel: "dirty"}, int64(meminfo.Dirty)*1024)
mc.mDirtyUsed.Record(map[string]string{stateLabel: "writeback"}, int64(meminfo.Writeback)*1024)
if meminfo.Dirty != nil {
mc.mDirtyUsed.Record(map[string]string{stateLabel: "dirty"}, int64(*meminfo.Dirty)*1024)
}
if meminfo.Writeback != nil {
mc.mDirtyUsed.Record(map[string]string{stateLabel: "writeback"}, int64(*meminfo.Writeback)*1024)
}
}
if mc.mAnonymousUsed != nil {
mc.mAnonymousUsed.Record(map[string]string{stateLabel: "active"}, int64(meminfo.ActiveAnon)*1024)
mc.mAnonymousUsed.Record(map[string]string{stateLabel: "inactive"}, int64(meminfo.InactiveAnon)*1024)
if meminfo.ActiveAnon != nil {
mc.mAnonymousUsed.Record(map[string]string{stateLabel: "active"}, int64(*meminfo.ActiveAnon)*1024)
}
if meminfo.InactiveAnon != nil {
mc.mAnonymousUsed.Record(map[string]string{stateLabel: "inactive"}, int64(*meminfo.InactiveAnon)*1024)
}
}
if mc.mPageCacheUsed != nil {
mc.mPageCacheUsed.Record(map[string]string{stateLabel: "active"}, int64(meminfo.ActiveFile)*1024)
mc.mPageCacheUsed.Record(map[string]string{stateLabel: "inactive"}, int64(meminfo.InactiveFile)*1024)
if meminfo.ActiveFile != nil {
mc.mPageCacheUsed.Record(map[string]string{stateLabel: "active"}, int64(*meminfo.ActiveFile)*1024)
}
if meminfo.InactiveFile != nil {
mc.mPageCacheUsed.Record(map[string]string{stateLabel: "inactive"}, int64(*meminfo.InactiveFile)*1024)
}
}
if mc.mUnevictableUsed != nil {
mc.mUnevictableUsed.Record(map[string]string{}, int64(meminfo.Unevictable)*1024)
if mc.mUnevictableUsed != nil && meminfo.Unevictable != nil {
mc.mUnevictableUsed.Record(map[string]string{}, int64(*meminfo.Unevictable)*1024)
}
}