Merge upstream/master (prezhdarov/vmware-exporter) into fork#1
Merged
Conversation
keep label logic out of exporter
feat(datastore): adds datastore accessibility gauge metric
Bumps [github.com/vmware/govmomi](https://github.com/vmware/govmomi) from 0.53.0 to 0.53.1. - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](vmware/govmomi@v0.53.0...v0.53.1) --- updated-dependencies: - dependency-name: github.com/vmware/govmomi dependency-version: 0.53.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…s/github.com/vmware/govmomi-0.53.1 Bump github.com/vmware/govmomi from 0.53.0 to 0.53.1
Update the import of prezhdarov/prometheus-exporter to use the new /pkg path. This fixes the 'BADKEY' errrors. Also log the name of the target when login fails.
Bumps [github.com/vmware/govmomi](https://github.com/vmware/govmomi) from 0.53.1 to 0.54.1. - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](vmware/govmomi@v0.53.1...v0.54.1) --- updated-dependencies: - dependency-name: github.com/vmware/govmomi dependency-version: 0.54.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.67.5 to 0.68.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/CHANGELOG.md) - [Commits](prometheus/common@v0.67.5...v0.68.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-version: 0.68.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/github.com/prometheus/common-0.68.1 Bump github.com/prometheus/common from 0.67.5 to 0.68.1
…s/github.com/vmware/govmomi-0.54.1 Bump github.com/vmware/govmomi from 0.53.1 to 0.54.1
Add GitHub Actions workflow for Go build and tests
Update logging dependency and log target name on login failure
…dencies fix: CI workflow
…and-slog-cleanup Improve reliability with expanded tests, safer performance scraping, and structured logging cleanup
added a tiny badge
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.68.1 to 0.69.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/CHANGELOG.md) - [Commits](prometheus/common@v0.68.1...v0.69.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-version: 0.69.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ng_counters_v2 fix: skip unsupported performance counters in scrapePerformance
…s/github.com/prometheus/common-0.69.0 Bump github.com/prometheus/common from 0.68.1 to 0.69.0
chore: fix lint and formatting issues across exporter codebase
Bumps [github.com/vmware/govmomi](https://github.com/vmware/govmomi) from 0.54.1 to 0.55.0. - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](vmware/govmomi@v0.54.1...v0.55.0) --- updated-dependencies: - dependency-name: github.com/vmware/govmomi dependency-version: 0.55.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/github.com/vmware/govmomi-0.55.0 Bump github.com/vmware/govmomi from 0.54.1 to 0.55.0
同步上游 37 个提交（16c58dc..57e178b）： - 依赖升级：govmomi 0.52.0 -> 0.55.0、prometheus/common 0.67.4 -> 0.69.0、 exporter-toolkit 0.15.0 -> 0.16.0、prometheus-exporter v0.1.2 -> v0.1.5 - prometheus-exporter 包路径迁移：collector/config/exporter -> pkg/ 下 - 上游新增测试：api/collectors/根目录共 4 个测试文件，api 测试已适配 fork 的 Credentials/requestWithCreds/govmomiLoginWithCreds 接口 - 上游修复：skip unsupported perf counters、datastore accessible、 Login 失败返回 loginData、响应体读写错误处理（errors.Join）、lint 清理 - 新增 CI test.yml 与 .golangci.yml - 保留 fork 全部功能：probe 多 vCenter 采集、每目标独立凭证、 中文文档、goreleaser/release 工作流、docker-compose、systemd unit
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.
同步内容
将上游 prezhdarov/vmware-exporter master 的 37 个提交（
16c58dc..57e178b）合并到本 fork，完整保留 fork 的 33 个自有提交（probe 多 vCenter 采集、每目标独立凭证、中文文档、goreleaser 等）。上游主要更新
pkg/下（collector/config/exporter → pkg/collector 等）test.yml与.golangci.yml冲突解决（8 处 / 3 文件）
.gitignore：取并集（保留dist/+vendor/）vmware-exporter.go：导入统一到pkg/路径；首页 handler 采用上游错误检查写法并保留exporterName；保留 fork 启动日志vmware/api/vmware.go：保留 fork 的govmomiLoginWithCreds流程，采纳上游 Login 失败返回 loginData 的修复及 errors.Join 错误处理测试适配
上游
vmware/api/vmware_test.go调用的是 fork 已删除的内部函数，已适配为requestWithCreds/govmomiLoginWithCreds/testCredentials()。验证
go build ./...✅go vet ./...✅go test ./...全部通过 ✅（含 govmomi simulator 集成测试）gofmt干净 ✅建议重点 review
vmware/api/vmware.go：Login 登录失败时返回值由nil改为loginData（采纳上游修复，调用方只检查 err，无行为影响）vmware/api/vmware_test.go：对 fork Credentials 接口的适配