Commit Graph

252 Commits

Author SHA1 Message Date
David Randall 2cc2249821
Merge pull request #205 from zxzharmlesszxz/master
Added determining device type and use it at scrape data
2024-05-06 20:32:21 -04:00
David Randall 0768a400a1
Merge pull request #180 from NiceGuyIT/docs
Fix: Issue 157: Document how to troubleshoot data inconsistencies
2024-05-05 11:18:39 -04:00
David Randall 089e8f20c1 Fix the command copy the extracted data
Signed-off-by: David Randall <David@NiceGuyIT.biz>
2024-05-05 11:11:41 -04:00
David Randall bcd3a7d173
Merge pull request #189 from k0ste/help2
collect-smartctl-json: shell fixes for script (#188)
2024-05-05 11:04:02 -04:00
David Randall 391aae38e4 Use long option and move the device name to the end
Signed-off-by: David Randall <David@NiceGuyIT.biz>
2024-05-05 10:29:02 -04:00
David Randall acdf4f30c9
Merge pull request #226 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-05-03 04:26:58 -04:00
prombot 9cbb98a4a2 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-05-02 17:49:46 +00:00
David Randall e7e123be3a
Merge pull request #225 from prometheus-community/dependabot/go_modules/github.com/prometheus/common-0.53.0
Bump github.com/prometheus/common from 0.51.1 to 0.53.0
2024-05-01 20:00:34 -04:00
dependabot[bot] b7cb7f758b
Bump github.com/prometheus/common from 0.51.1 to 0.53.0
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.51.1 to 0.53.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](https://github.com/prometheus/common/compare/v0.51.1...v0.53.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:54:40 +00:00
David Randall 7482daf69a
Merge pull request #223 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-04-20 06:27:27 -04:00
prombot e4997fe73a Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-04-18 17:49:42 +00:00
Robin H. Johnson ea8a38384b
fix: correct smartctl_device_bytes_written & smartctl_device_bytes_read for NVMe (#211)
The NVMe specification says that the controller is responsible for
reporting "Data Units Read" & "Data Units Written" converted as needed
for logicial block sizes other than 512-bytes. smartmontools already has
the correct behavior.

What is correct in this case? For now, track what smartmontools does:
take the counter, multiply by 512*1000, report the value.

We should be clear that it means the drive has read/written at most
that many bytes.

This has a few impacts:
- NVME devices will now show these metrics, if they did not before.
- NVME devices with blocksize other than 512-bytes may have previously
  reported inflated metrics, but are now corrected (is this worthy of
  larger notice in changelogs?)

Reference: 11415ee0b9/smartmontools/nvmeprint.cpp (L394-L397)
Closes: https://github.com/prometheus-community/smartctl_exporter/issues/122

Signed-off-by: Robin H. Johnson <rjohnson@coreweave.com>
2024-04-09 09:40:44 +02:00
David Randall d6cd1815eb
Merge pull request #220 from prometheus-community/dependabot/go_modules/github.com/prometheus/common-0.51.1
Bump github.com/prometheus/common from 0.48.0 to 0.51.1
2024-04-01 15:54:14 -04:00
dependabot[bot] 8167a37704
Bump github.com/prometheus/common from 0.48.0 to 0.51.1
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.51.1.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](https://github.com/prometheus/common/compare/v0.48.0...v0.51.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:13:44 +00:00
PrometheusBot 04091a0b50
Update common Prometheus files (#219)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-23 16:16:26 +01:00
David Randall 94c8f04feb
Merge pull request #218 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-21 19:31:17 -04:00
prombot 1dc96d6597 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-21 17:48:52 +00:00
David Randall d756b2681b
Merge pull request #217 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-20 18:29:26 -04:00
prombot ed485fa16f Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-20 17:49:17 +00:00
David Randall b6f34f5392
Merge pull request #216 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-19 19:26:17 -04:00
prombot 9bfb504d6e Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-19 17:48:43 +00:00
David Randall a32762e7d5
Merge pull request #215 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-18 18:25:32 -04:00
prombot a399ae6ea4 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-18 17:48:36 +00:00
Denys 7f7c652b0f Add bus name & bus number to disk name, example: bus_0_megaraid_disk_01
Signed-off-by: Denys <zxzharmlesszxz@gmail.com>
2024-03-16 00:37:09 +01:00
David Randall 5f59bb9113
Merge pull request #214 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-13 18:49:19 -04:00
prombot 79f5db1d68 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-13 17:48:48 +00:00
mort 3a012b5bb1 Implemented new features - extract raid member disk name.
Modified smartctl.device param - now you can set it as sda, megaraid_disk_01, etc.

Signed-off-by: Denys <zxzharmlesszxz@gmail.com>
2024-03-08 15:40:11 +01:00
David Randall 84d8cc3d4d
Merge pull request #212 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-06 19:29:21 -05:00
prombot 0cece6c9ca Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-06 17:48:50 +00:00
David Randall aa8d7ce567
Merge pull request #210 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-03-04 14:28:39 -05:00
prombot cd32ed5189 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-03-04 17:49:31 +00:00
David Randall 10ba1970e8
Merge pull request #209 from prometheus-community/superq/v0.12.0
Release v0.12.0
2024-03-03 12:53:55 -05:00
SuperQ a60837ff6e
Release v0.12.0
* [CHANGE] Better SCSI/SAS support, and removing confused metrics #168
* [ENHANCEMENT] Impvoe the JSON collection script; now requires jq/yq #176
* [BUGFIX] Shell fixes for `collect-smartctl-json.sh` #178
* [BUGFIX] Various fixes to `collect_fake_json.sh` #159

Signed-off-by: SuperQ <superq@gmail.com>
2024-03-03 16:17:14 +01:00
David Randall cc7ce36732
Merge pull request #208 from prometheus-community/superq/1.22
Update Go
2024-03-03 06:36:48 -05:00
SuperQ 813e085b0d
Update Go
* Update Go to 1.22.
* Update minimum Go version to 1.21.

Signed-off-by: SuperQ <superq@gmail.com>
2024-03-03 10:23:17 +01:00
dependabot[bot] a141a82e68
Bump github.com/prometheus/client_golang from 1.18.0 to 1.19.0 (#207)
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.18.0 to 1.19.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/v1.19.0/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.18.0...v1.19.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-02 18:17:19 +01:00
David Randall 0dc8fb3e55
Merge pull request #188 from k0ste/help
Added more testdata json's
2024-03-02 08:51:16 -05:00
David Randall 17da6697c8
Merge pull request #206 from prometheus-community/dependabot/go_modules/github.com/tidwall/gjson-1.17.1
Bump github.com/tidwall/gjson from 1.17.0 to 1.17.1
2024-03-01 21:05:01 -05:00
dependabot[bot] 9394779256
Bump github.com/tidwall/gjson from 1.17.0 to 1.17.1
Bumps [github.com/tidwall/gjson](https://github.com/tidwall/gjson) from 1.17.0 to 1.17.1.
- [Commits](https://github.com/tidwall/gjson/compare/v1.17.0...v1.17.1)

---
updated-dependencies:
- dependency-name: github.com/tidwall/gjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-01 15:57:21 +00:00
PrometheusBot b06982fe08
Update common Prometheus files (#203)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-02-28 09:25:18 +01:00
David Randall 58a7eb8756
Merge pull request #200 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-02-06 21:10:25 -05:00
prombot 14860d44fe Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-02-06 17:50:25 +00:00
David Randall a1a414cad4
Merge pull request #199 from prometheus-community/dependabot/go_modules/github.com/prometheus/common-0.46.0
Bump github.com/prometheus/common from 0.45.0 to 0.46.0
2024-02-01 21:02:55 -05:00
dependabot[bot] 1921e16582
Bump github.com/prometheus/common from 0.45.0 to 0.46.0
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.45.0 to 0.46.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](https://github.com/prometheus/common/compare/v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 15:15:12 +00:00
Ben Kochie 77e6b075fa
Update json reading logging (#198)
Update the smartctl command reading and parsing of json logging to make
for easier debugging of slow devices by adding a duration to the debug
logging.

For https://github.com/prometheus-community/smartctl_exporter/issues/197

Signed-off-by: SuperQ <superq@gmail.com>
2024-01-25 17:52:05 +01:00
David Randall 844af85ca8
Merge pull request #194 from prometheus-community/repo_sync
Synchronize common files from prometheus/prometheus
2024-01-08 12:59:25 -05:00
prombot 8e1ebdd668 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-01-08 17:48:59 +00:00
David Randall 4554e35937
Merge pull request #191 from prometheus-community/dependabot/go_modules/github.com/prometheus/client_golang-1.18.0
Bump github.com/prometheus/client_golang from 1.17.0 to 1.18.0
2024-01-01 19:59:43 -05:00
dependabot[bot] fbc5d901a6
Bump github.com/prometheus/client_golang from 1.17.0 to 1.18.0
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.17.0...v1.18.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-02 00:52:41 +00:00
David Randall 18957fb64d
Merge pull request #192 from prometheus-community/dependabot/go_modules/github.com/prometheus/exporter-toolkit-0.11.0
Bump github.com/prometheus/exporter-toolkit from 0.10.0 to 0.11.0
2024-01-01 19:51:52 -05:00