Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nickbabcock/OhmGraphite
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.8.1
Choose a base ref
...
head repository: nickbabcock/OhmGraphite
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 15,012 additions and 674 deletions.
  1. +1 −0 .github/FUNDING.yml
  2. +9 −0 .github/dependabot.yml
  3. +29 −0 .github/workflows/ci.yml
  4. +40 −0 .github/workflows/release.yml
  5. +0 −3 .gitmodules
  6. +0 −5 .travis.yml
  7. +538 −1 CHANGELOG.md
  8. +0 −1 LibreHardwareMonitor
  9. +9 −0 OhmGraphite.Test/BlankConfig.cs
  10. +73 −1 OhmGraphite.Test/ConfigTest.cs
  11. +1 −0 OhmGraphite.Test/CustomConfig.cs
  12. +34 −0 OhmGraphite.Test/DockerUtils.cs
  13. +5 −6 OhmGraphite.Test/FormatMetricsTest.cs
  14. +78 −24 OhmGraphite.Test/GraphiteTest.cs
  15. +265 −11 OhmGraphite.Test/InfluxTest.cs
  16. +20 −0 OhmGraphite.Test/OhmCliTest.cs
  17. +18 −10 OhmGraphite.Test/OhmGraphite.Test.csproj
  18. +52 −13 OhmGraphite.Test/PrometheusTest.cs
  19. +25 −26 OhmGraphite.Test/SensorCollectorTest.cs
  20. +4 −5 OhmGraphite.Test/TestSensorCreator.cs
  21. +54 −28 OhmGraphite.Test/TimescaleTest.cs
  22. +28 −0 OhmGraphite.Test/TranslationTest.cs
  23. +6 −8 OhmGraphite.sln
  24. +0 −9 OhmGraphite/AppConfigManager.cs
  25. +17 −0 OhmGraphite/CustomConfig.cs
  26. +12 −0 OhmGraphite/DnsResolution.cs
  27. +0 −5 OhmGraphite/FodyWeavers.xml
  28. +32 −2 OhmGraphite/GraphiteWriter.cs
  29. +1 −0 OhmGraphite/IAppConfig.cs
  30. +4 −3 OhmGraphite/IManage.cs
  31. +7 −0 OhmGraphite/INameResolution.cs
  32. +1 −1 OhmGraphite/IWriteMetrics.cs
  33. +60 −0 OhmGraphite/Influx2Config.cs
  34. +52 −0 OhmGraphite/Influx2Writer.cs
  35. +6 −2 OhmGraphite/InfluxWriter.cs
  36. +110 −2 OhmGraphite/MetricConfig.cs
  37. +14 −15 OhmGraphite/MetricTimer.cs
  38. +12 −0 OhmGraphite/NetBiosResolution.cs
  39. +211 −0 OhmGraphite/OhmCli.cs
  40. +29 −25 OhmGraphite/OhmGraphite.csproj
  41. +66 −0 OhmGraphite/OhmNvme.cs
  42. +43 −0 OhmGraphite/OhmSensor.cs
  43. +3 −77 OhmGraphite/Program.cs
  44. +94 −16 OhmGraphite/PrometheusCollection.cs
  45. +11 −3 OhmGraphite/PrometheusConfig.cs
  46. +2 −2 OhmGraphite/PrometheusServer.cs
  47. +43 −3 OhmGraphite/ReportedValue.cs
  48. +90 −15 OhmGraphite/SensorCollector.cs
  49. +11 −0 OhmGraphite/StaticResolution.cs
  50. +108 −86 OhmGraphite/TimescaleWriter.cs
  51. +140 −0 OhmGraphite/Translation.cs
  52. +1 −1 OhmGraphite/UpdateVisitor.cs
  53. +89 −0 OhmGraphite/Worker.cs
  54. +318 −42 README.md
  55. +0 −11 appveyor.yml
  56. +1 −1 {ci → assets}/Dockerfile.timescale
  57. BIN assets/dashboard.png
  58. BIN assets/dashboards/dashboard-fan-rpm.png
  59. BIN assets/dashboards/dashboard-frequencies.png
  60. BIN assets/dashboards/dashboard-load.png
  61. BIN assets/dashboards/dashboard-ram.png
  62. BIN assets/dashboards/dashboard-temperatures.png
  63. BIN assets/dashboards/dashboard-volts.png
  64. +1,625 −0 assets/dashboards/ohm-graphite.json
  65. 0 dashboard-example.json → assets/dashboards/ohm-influx-alt.json
  66. +2,511 −0 assets/dashboards/ohm-influx.json
  67. +4,886 −0 assets/dashboards/ohm-prometheus.json
  68. +3,031 −0 assets/dashboards/ohm-timescale.json
  69. +16 −0 assets/hidden-sensors.config
  70. +12 −0 assets/influx2-ssl.config
  71. +11 −0 assets/influx2.config
  72. +21 −0 assets/influxdb-selfsigned.crt
  73. +12 −0 assets/rename.config
  74. +6 −0 assets/static-name.config
  75. +0 −6 ci/Dockerfile.tests
  76. 0 ci/setup-docker.sh
  77. +4 −0 ci/timescale.dockerfile
  78. +0 −177 ci/wait-for-it.sh
  79. +0 −28 docker-compose.yml
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: [nickbabcock]
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: nuget
directory: "/"
schedule:
interval: monthly
open-pull-requests-limit: 10
ignore:
- dependency-name: "LibreHardwareMonitorLib"
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: CI

on:
pull_request:
push:
branches: ['master']
tags: ['v*']
schedule:
- cron: '00 01 * * *'

jobs:
test:
name: test
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'windows-latest']
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- run: dotnet test
if: matrix.os == 'ubuntu-latest'
- run: dotnet test --filter 'Category!=integration'
if: matrix.os == 'windows-latest'
40 changes: 40 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Release

on:
pull_request:
push:
branches: ['master']
tags: ['v*']
schedule:
- cron: '00 01 * * *'

jobs:
release:
name: release
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.*'
- run: dotnet publish -c Release .\OhmGraphite\
- name: Set artifact name
shell: bash
working-directory: OhmGraphite\bin
run: |
echo "ARTIFACT_NAME=$(echo *.zip)" >> $GITHUB_ENV
- uses: actions/upload-artifact@v4
with:
path: OhmGraphite\bin\*.zip
name: ${{ env.ARTIFACT_NAME }}
if-no-files-found: error
- name: Release
uses: softprops/action-gh-release@v0.1.13 # https://github.com/softprops/action-gh-release/issues/280
if: startsWith(github.ref, 'refs/tags/')
with:
files: 'OhmGraphite\bin\*.zip'
prerelease: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "LibreHardwareMonitor"]
path = LibreHardwareMonitor
url = https://github.com/LibreHardwareMonitor/LibreHardwareMonitor
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

Loading