Skip to content

Commit

Permalink
Merge branch 'teslamate-org:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
micves authored Nov 11, 2024
2 parents ff908ba + 93cc344 commit 21e1fc2
Show file tree
Hide file tree
Showing 40 changed files with 1,317 additions and 685 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/buildx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Buildx
uses: ./.github/actions/build
with:
Expand All @@ -65,7 +65,7 @@ jobs:
if: needs.check_paths.outputs.githubfolder != 'true' || github.event_name == 'schedule'
steps:
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
Expand All @@ -88,7 +88,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
outputs:
githubfolder: ${{ steps.filter.outputs.githubfolder }}
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
id: filter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Setup Elixir and Cache Dependencies
id: setup-elixir-and-cache-deps
Expand All @@ -43,7 +43,7 @@ jobs:

- name: Restore PLT cache
id: plt_cache
uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
with:
key: |
${{ runner.os }}-${{ steps.setup-elixir-and-cache-deps.outputs.elixir-version }}-${{ steps.setup-elixir-and-cache-deps.outputs.otp-version }}-plt
Expand All @@ -58,7 +58,7 @@ jobs:

- name: Save PLT cache
id: plt_cache_save
uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache/save@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
if: steps.plt_cache.outputs.cache-hit != 'true'
with:
key: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/elixir_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Setup Elixir and Cache Dependencies
id: setup-elixir-and-cache-deps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ensure_linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
check_linting:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install Nix
uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b #v27
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 #v30
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ghcr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
runs-on: ${{ matrix.runs_on }}
timeout-minutes: 10
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
if: ${{ github.event_name != 'pull_request_target' }}
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
if: ${{ github.event_name == 'pull_request_target' }}
with:
ref: ${{github.event.pull_request.head.ref}}
Expand All @@ -70,7 +70,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Login to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
Expand All @@ -88,9 +88,9 @@ jobs:
if: needs.check_paths.outputs.githubfolder != 'true'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
if: ${{ github.event_name != 'pull_request_target' }}
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
if: ${{ github.event_name == 'pull_request_target' }}
with:
ref: ${{github.event.pull_request.head.ref}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Spell check
uses: crate-ci/typos@6802cc60d4e7f78b9d5454f6cf3935c042d5e1e3 # v1.26.0
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,35 @@

### Improvements and bug fixes

- feat: use Grafana 11.2.3 (#4338 - @swiffer)

#### Build, CI, internal

- ci: remove unknown flag --ref for gh cache delete in cleanup_caches workflow ([3a515df](https://github.com/teslamate-org/teslamate/commit/3a515df5aa400139acf8ef638e5ae37339c553cf) - @JakobLichterfeld)
- build(deps): bump actions/checkout from 4.2.1 to 4.2.2 (#4340)
- build(deps): bump actions/cache from 4.0.2 to 4.1.2 (#4341)
- build(deps): bump cachix/install-nix-action from 27 to 30 (#4342)
- build(deps): bump tesla from 1.12.1 to 1.13.0 (#4335)
- build(deps): bump floki from 0.36.2 to 0.36.3 (#4336)
- feat: add CONTRIBUTING file to exclusion lists for treefmt (#4359 - @JakobLichterfeld)

#### Dashboards

- fix: allow editing of dashboards - [changes will be overwritten on update](https://grafana.com/docs/grafana/latest/administration/provisioning/#making-changes-to-a-provisioned-dashboard) (#4338 - @swiffer)
- fix: ensure max speed panels are converted according to length unit setting in drive stats dashboard (#4338 - @swiffer)
- perf: speed up queries used to calculate max speed in drive stats dashboard (#4338 - @swiffer)
- feat: add a welcome dashboard (#4338 - @swiffer)
- fix: Charges Dashboard -> Range added renamed to Ø Charge rate (#4349 - @swiffer)
- fix: Axis Labels for XY Chart in Battery Health and reduces Query count in Visited (#4364 - @swiffer)

#### Translations

#### Documentation

docs: add contributing guidelines link for GitHub (#4345 - @JakobLichterfeld)
docs: update Home Assistant integration documentation with configuration URL and model name hints (#4359 - @JakobLichterfeld)
docs: Remove availability from Home Assistant MQTT sensors, as it can be misleading and prevent sensors from receiving updated values (#4362 - @longzheng)

## [1.31.1] - 2024-10-29

This release primarily prevents beam.smp from overloading the CPU on ARM hosts. It also includes a number of other bug fixes and performance improvements. Enjoy it.
Expand Down
3 changes: 3 additions & 0 deletions CONTRIBUTING
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Contributing Guidelines

see [Development and Contributing](https://docs.teslamate.org/docs/development/)
3 changes: 2 additions & 1 deletion grafana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ensure selecting a tag that is available for arm/v7, arm64, and amd64
# https://hub.docker.com/r/grafana/grafana/tags
FROM grafana/grafana:11.0.6-security-01
FROM grafana/grafana:11.2.3

ENV GF_ANALYTICS_REPORTING_ENABLED=false \
GF_AUTH_ANONYMOUS_ENABLED=false \
Expand All @@ -12,6 +12,7 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
GF_USERS_ALLOW_SIGN_UP=false \
GF_USERS_DEFAULT_LANGUAGE=detect \
GF_DATE_FORMATS_USE_BROWSER_LOCALE=true \
GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/dashboards_internal/home.json \
DATABASE_PORT=5432 \
DATABASE_SSL_MODE=disable

Expand Down
6 changes: 3 additions & 3 deletions grafana/dashboards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ providers:
folderUid: Nr4ofiDZk
type: file
disableDeletion: false
editable: true
allowUiUpdates: true
updateIntervalSeconds: 86400
options:
path: /dashboards
Expand All @@ -17,7 +17,7 @@ providers:
folderUid: Nr5ofiDZk
type: file
disableDeletion: false
editable: true
allowUiUpdates: true
updateIntervalSeconds: 86400
options:
path: /dashboards_internal
Expand All @@ -27,7 +27,7 @@ providers:
folderUid: Nr6ofiDZk
type: file
disableDeletion: false
editable: true
allowUiUpdates: true
updateIntervalSeconds: 86400
options:
path: /dashboards_reports
Loading

0 comments on commit 21e1fc2

Please sign in to comment.