File tree 2 files changed +16
-5
lines changed
2 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -221,7 +221,7 @@ func TestProcessManager_GetProcessExec(t *testing.T) {
221
221
}
222
222
223
223
func Test_getNodeNameForExport (t * testing.T ) {
224
- assert .Equal (t , "" , node .GetNodeNameForExport ())
224
+ assert .NotEqual (t , "" , node .GetNodeNameForExport ()) // we should get the hostname here
225
225
assert .NoError (t , os .Setenv ("NODE_NAME" , "from-node-name" ))
226
226
assert .Equal (t , "from-node-name" , node .GetNodeNameForExport ())
227
227
assert .NoError (t , os .Setenv ("HUBBLE_NODE_NAME" , "from-hubble-node-name" ))
Original file line number Diff line number Diff line change 3
3
4
4
package node
5
5
6
- import "os"
6
+ import (
7
+ "os"
8
+
9
+ "github.com/cilium/tetragon/pkg/logger"
10
+ )
7
11
8
12
// getNodeNameForExport returns node name string for JSON export. It uses NODE_NAME
9
13
// env variable by default, which is also used by k8s watcher to watch for local pods:
@@ -12,9 +16,16 @@ import "os"
12
16
//
13
17
// Set HUBBLE_NODE_NAME to override the node_name field for JSON export.
14
18
func GetNodeNameForExport () string {
19
+ var err error
15
20
nodeName := os .Getenv ("HUBBLE_NODE_NAME" )
16
- if nodeName != "" {
17
- return nodeName
21
+ if nodeName == "" {
22
+ nodeName = os .Getenv ("NODE_NAME" )
23
+ }
24
+ if nodeName == "" {
25
+ nodeName , err = os .Hostname ()
26
+ if err != nil {
27
+ logger .GetLogger ().WithError (err ).Warn ("failed to retrieve hostname" )
28
+ }
18
29
}
19
- return os . Getenv ( "NODE_NAME" )
30
+ return nodeName
20
31
}
You can’t perform that action at this time.
0 commit comments