Skip to content

Commit 8d155ac

Browse files
author
manogna_grandhi
committed
reordered e2e-64k-output.txt file
Signed-off-by: manogna_grandhi <grandhi.manogna@flipkart.com>
1 parent 4dfa7f5 commit 8d155ac

2 files changed

Lines changed: 1 addition & 61 deletions

File tree

collector/edac_linux.go

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ type edacCollector struct {
4040
ueCount *prometheus.Desc
4141
channelCECount *prometheus.Desc
4242
channelUECount *prometheus.Desc
43-
dimmCECount *prometheus.Desc
44-
dimmUECount *prometheus.Desc
4543
logger *slog.Logger
4644
}
4745

@@ -81,21 +79,8 @@ func NewEdacCollector(logger *slog.Logger) (Collector, error) {
8179
nil,
8280
),
8381

84-
dimmCECount: prometheus.NewDesc(
85-
prometheus.BuildFQName(namespace, edacSubsystem, "dimm_correctable_errors_total"),
86-
"Total correctable memory errors for this dimm.",
87-
[]string{"controller", "dimm"},
88-
nil,
89-
),
90-
91-
dimmUECount: prometheus.NewDesc(
92-
prometheus.BuildFQName(namespace, edacSubsystem, "dimm_uncorrectable_errors_total"),
93-
"Total uncorrectable memory errors for this dimm.",
94-
[]string{"controller", "dimm"},
95-
nil,
96-
),
97-
9882
logger: logger,
83+
9984
}, nil
10085
}
10186

@@ -201,43 +186,6 @@ func (c *edacCollector) Update(ch chan<- prometheus.Metric) error {
201186
}
202187
}
203188
}
204-
205-
dimms, err := filepath.Glob(controller + "/dimm[0-9]*")
206-
if err != nil {
207-
return err
208-
}
209-
210-
for _, dimm := range dimms {
211-
212-
dimmMatch := edacMemDimmRE.FindStringSubmatch(dimm)
213-
if len(dimmMatch) < 2 {
214-
continue
215-
}
216-
217-
dimmNumber := dimmMatch[1]
218-
219-
value, err := readUintFromFile(filepath.Join(dimm, "dimm_ce_count"))
220-
if err == nil {
221-
ch <- prometheus.MustNewConstMetric(
222-
c.dimmCECount,
223-
prometheus.CounterValue,
224-
float64(value),
225-
controllerNumber,
226-
dimmNumber,
227-
)
228-
}
229-
230-
value, err = readUintFromFile(filepath.Join(dimm, "dimm_ue_count"))
231-
if err == nil {
232-
ch <- prometheus.MustNewConstMetric(
233-
c.dimmUECount,
234-
prometheus.CounterValue,
235-
float64(value),
236-
controllerNumber,
237-
dimmNumber,
238-
)
239-
}
240-
}
241189
}
242190

243191
return nil

collector/fixtures/e2e-64k-page-output.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,14 +1346,6 @@ node_edac_channel_uncorrectable_errors_total{channel="1",controller="0",csrow="1
13461346
# HELP node_edac_correctable_errors_total Total correctable memory errors.
13471347
# TYPE node_edac_correctable_errors_total counter
13481348
node_edac_correctable_errors_total{controller="0"} 1
1349-
# HELP node_edac_csrow_correctable_errors_total Total correctable memory errors for this csrow.
1350-
# TYPE node_edac_csrow_correctable_errors_total counter
1351-
node_edac_csrow_correctable_errors_total{controller="0",csrow="0"} 3
1352-
node_edac_csrow_correctable_errors_total{controller="0",csrow="unknown"} 2
1353-
# HELP node_edac_csrow_uncorrectable_errors_total Total uncorrectable memory errors for this csrow.
1354-
# TYPE node_edac_csrow_uncorrectable_errors_total counter
1355-
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="0"} 4
1356-
node_edac_csrow_uncorrectable_errors_total{controller="0",csrow="unknown"} 6
13571349
# HELP node_edac_uncorrectable_errors_total Total uncorrectable memory errors.
13581350
# TYPE node_edac_uncorrectable_errors_total counter
13591351
node_edac_uncorrectable_errors_total{controller="0"} 5

0 commit comments

Comments
 (0)