Merge branch 'main' into feature/interface-transceivers-7.4

Author: SuperQ

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
         thread: [ 0, 1, 2 ]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: prometheus/promci@52c7012f5f0070d7281b8db4a119e21341d43c91 # v0.4.5
+      - uses: prometheus/promci@443c7fc2397e946bc9f5029e313a9c3441b9b86d # v0.4.7
       - uses: ./.github/promci/actions/build
         with:
           promu_opts: "-p linux/amd64 -p windows/amd64 -p darwin/amd64 -p linux/arm64 -p windows/arm64 -p darwin/arm64"
@@ -41,7 +41,7 @@ jobs:
         thread: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: prometheus/promci@52c7012f5f0070d7281b8db4a119e21341d43c91 # v0.4.5
+      - uses: prometheus/promci@443c7fc2397e946bc9f5029e313a9c3441b9b86d # v0.4.7
       - uses: ./.github/promci/actions/build
         with:
           parallelism: 12
@@ -68,7 +68,7 @@ jobs:
       (github.event_name == 'push' && github.event.ref == 'refs/heads/main')
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: prometheus/promci@52c7012f5f0070d7281b8db4a119e21341d43c91 # v0.4.5
+      - uses: prometheus/promci@443c7fc2397e946bc9f5029e313a9c3441b9b86d # v0.4.7
       - uses: ./.github/promci/actions/publish_main
         with:
           docker_hub_organization: prometheuscommunity
@@ -88,7 +88,7 @@ jobs:
       (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v0.'))
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: prometheus/promci@52c7012f5f0070d7281b8db4a119e21341d43c91 # v0.4.5
+      - uses: prometheus/promci@443c7fc2397e946bc9f5029e313a9c3441b9b86d # v0.4.7
       - uses: ./.github/promci/actions/publish_release
         with:
           docker_hub_organization: prometheuscommunity

README.md

@@ -92,7 +92,7 @@ Per-VDOM:
    * `fortigate_interface_transmit_errors_total`
    * `fortigate_interface_receive_errors_total`
  * _System/Interface/Transceivers_
-   * `fortigate_inteface_transceivers`
+   * `fortigate_inteface_transceivers_info`
  * _System/SDNConnector_
    * `fortigate_system_sdn_connector_status`
    * `fortigate_system_sdn_connector_last_update_seconds`

pkg/probe/system_interface_transceivers.go

@@ -23,7 +23,7 @@ import (
 func probeSystemInterfaceTransceivers(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	var (
 		interfaceTransceivers = prometheus.NewDesc(
-			"fortigate_inteface_transceivers",
+			"fortigate_inteface_transceivers_info",
 			"Interface transceivers information",
 			[]string{"interface", "type", "vendor", "vendorpartnumber", "vendorserialnumber"}, nil,
 		)