Added label: vlanid to system_interface.go - #279
Merged
bastischubert merged 1 commit intoApr 4, 2026
Merged
Conversation
jseifeddine
force-pushed
the
feature/add-vlanid-label
branch
from
February 9, 2024 11:18
c8ceb13 to
3714c6d
Compare
jseifeddine
commented
Feb 9, 2024
| RxBytes float64 `json:"rx_bytes"` | ||
| TxErrors float64 `json:"tx_errors"` | ||
| RxErrors float64 `json:"rx_errors"` | ||
| VlanID int `json:"vlanid"` |
Contributor
Author
There was a problem hiding this comment.
json:"vlanid" is an int, I tried keeping as string (for Prometheus metric label), but:
Error: json: cannot unmarshal number into Go struct field ifResult.Results.vlanid of type string
jseifeddine
commented
Feb 9, 2024
| m = append(m, prometheus.MustNewConstMetric(mRxB, prometheus.CounterValue, ir.RxBytes, v.VDOM, ir.Name, ir.Alias, ir.Interface)) | ||
| m = append(m, prometheus.MustNewConstMetric(mTxErr, prometheus.CounterValue, ir.TxErrors, v.VDOM, ir.Name, ir.Alias, ir.Interface)) | ||
| m = append(m, prometheus.MustNewConstMetric(mRxErr, prometheus.CounterValue, ir.RxErrors, v.VDOM, ir.Name, ir.Alias, ir.Interface)) | ||
| vlan_string := strconv.Itoa(ir.VlanID) |
Contributor
Author
There was a problem hiding this comment.
Prometheus label must be a string, so we convert it before adding to the metric
Contributor
|
tested with 6.4 + 7.6 - can you @jseifeddine resolve the conflict and i'm happy to merge |
jseifeddine
force-pushed
the
feature/add-vlanid-label
branch
5 times, most recently
from
April 2, 2026 10:18
31e6c23 to
e4196c6
Compare
Contributor
Author
|
@bastischubert thanks, done |
jseifeddine
force-pushed
the
feature/add-vlanid-label
branch
6 times, most recently
from
April 2, 2026 11:28
c6c25c0 to
b899d89
Compare
Signed-off-by: Jad Seifeddine <jad.seifeddine@icloud.com>
jseifeddine
force-pushed
the
feature/add-vlanid-label
branch
from
April 2, 2026 11:33
b899d89 to
3a28f2d
Compare
Contributor
Author
|
good to go now @bastischubert sorry about that ➜ jadseifeddine fortigate_exporter (feature/add-vlanid-label) ✔ golangci-lint run ./...
0 issues. |
Contributor
|
FYI, this change broke the main build. The tests do not pass. |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Feature add for issue #249
@bluecmd please review 🔢
We have this tested and working in our environment for the last ~6 months, no issues to date.