|
5 | 5 | "compress/gzip"
|
6 | 6 | "context"
|
7 | 7 | "fmt"
|
| 8 | + "io" |
8 | 9 | "strconv"
|
9 | 10 |
|
10 | 11 | "github.com/openshift/insights-operator/pkg/gatherers/common"
|
@@ -63,7 +64,7 @@ func (g *Gatherer) GatherNodeLogs(ctx context.Context) ([]record.Record, []error
|
63 | 64 | }
|
64 | 65 |
|
65 | 66 | func gatherNodeLogs(ctx context.Context, client corev1client.CoreV1Interface) ([]record.Record, []error) {
|
66 |
| - nodes, err := client.Nodes().List(ctx, metav1.ListOptions{}) |
| 67 | + nodes, err := client.Nodes().List(ctx, metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/master"}) |
67 | 68 | if err != nil {
|
68 | 69 | return nil, []error{err}
|
69 | 70 | }
|
@@ -119,19 +120,24 @@ func nodeLogString(ctx context.Context, req *rest.Request) (string, error) {
|
119 | 120 | return "", err
|
120 | 121 | }
|
121 | 122 | defer func() {
|
122 |
| - _ = in.Close() |
| 123 | + if closeErr := in.Close(); closeErr != nil { |
| 124 | + klog.Errorf("failed to close the request stream: %v", closeErr) |
| 125 | + } |
123 | 126 | }()
|
124 | 127 |
|
125 |
| - r, err := gzip.NewReader(in) |
126 |
| - var scanner *bufio.Scanner |
127 |
| - if err != nil { |
128 |
| - scanner = bufio.NewScanner(in) |
| 128 | + var reader io.Reader |
| 129 | + if r, err := gzip.NewReader(in); err != nil { |
| 130 | + klog.Warningf("failed to create gzip reader: %v. Reading uncompressed data.", err) |
| 131 | + reader = in |
129 | 132 | } else {
|
130 | 133 | defer func() {
|
131 |
| - _ = r.Close() |
| 134 | + if closeErr := r.Close(); closeErr != nil { |
| 135 | + klog.Errorf("failed to close the gzip reader: %v", closeErr) |
| 136 | + } |
132 | 137 | }()
|
133 |
| - scanner = bufio.NewScanner(r) |
| 138 | + reader = r |
134 | 139 | }
|
| 140 | + scanner := bufio.NewScanner(reader) |
135 | 141 |
|
136 | 142 | messagesToSearch := nodeLogsMessagesFilter()
|
137 | 143 | return common.FilterLogFromScanner(scanner, messagesToSearch, true, func(lines []string) []string {
|
|
0 commit comments