Skip to content

fix: Prevent panic in import.git when update fails [backport]#5204

Merged
jharvey10 merged 1 commit intorelease/v1.12from
backport/pr-5198-to-v1.12
Jan 8, 2026
Merged

fix: Prevent panic in import.git when update fails [backport]#5204
jharvey10 merged 1 commit intorelease/v1.12from
backport/pr-5198-to-v1.12

Conversation

@jharvey10
Copy link
Contributor

(cherry picked from commit 577a591)

Brief description of Pull Request

Avoid panics in import.git update by returning the update failure error appropriately when the local clone of a repo is unavailable.

@jharvey10 jharvey10 requested a review from a team as a code owner January 8, 2026 00:23
@jharvey10 jharvey10 changed the title fix: Prevent panic in import.git when update fails (#5198) fix: Prevent panic in import.git when update fails Jan 8, 2026
@jharvey10 jharvey10 enabled auto-merge (squash) January 8, 2026 00:25
@jharvey10 jharvey10 changed the title fix: Prevent panic in import.git when update fails fix: Prevent panic in import.git when update fails [backport] Jan 8, 2026
@jharvey10 jharvey10 disabled auto-merge January 8, 2026 00:26
@jharvey10 jharvey10 enabled auto-merge (squash) January 8, 2026 00:26
@jharvey10 jharvey10 merged commit c82fbae into release/v1.12 Jan 8, 2026
42 checks passed
@jharvey10 jharvey10 deleted the backport/pr-5198-to-v1.12 branch January 8, 2026 01:56
renovate bot added a commit to sdwilsh/sOS that referenced this pull request Jan 8, 2026
##### [\`v1.12.2\`](https://github.com/grafana/alloy/releases/tag/v1.12.2)

##### Bug Fixes 🐛

- Add missing configuration parameter `deployment_name_from_replicaset` to k8sattributes processor ([5b90a9d](grafana/alloy@5b90a9d))
- **database\_observability:** Fix schema\_details collector to fetch column definitions with case sensitive table names ([#4872](grafana/alloy#4872)) ([560dff4](grafana/alloy@560dff4)) ([@jharvey10](https://github.com/jharvey10), [@fridgepoet](https://github.com/fridgepoet))
- **deps:** Update jose2go to 1.7.0 ([#4858](grafana/alloy#4858)) ([dfdd341](grafana/alloy@dfdd341)) ([@jharvey10](https://github.com/jharvey10))
- **deps:** Update npm dependencies \[backport] ([#5201](grafana/alloy#5201)) ([8e06c26](grafana/alloy@8e06c26)) ([@jharvey10](https://github.com/jharvey10))
- Ensure the squid exporter wrapper properly brackets ipv6 addresses \[backport] ([#5205](grafana/alloy#5205)) ([e329cc6](grafana/alloy@e329cc6))
- Preserve meta labels in loki.source.podlogs ([#5097](grafana/alloy#5097)) ([ab4b21e](grafana/alloy@ab4b21e)) ([@kalleep](https://github.com/kalleep))
- Prevent panic in import.git when update fails \[backport] ([#5204](grafana/alloy#5204)) ([c82fbae](grafana/alloy@c82fbae)) ([@jharvey10](https://github.com/jharvey10))
- show correct fallback alloy version instead of v1.13.0 ([#5110](grafana/alloy#5110)) ([b72be99](grafana/alloy@b72be99)) ([@jharvey10](https://github.com/jharvey10))

#### Upgrading

Read the [release notes] for specific instructions on upgrading from older versions:

[release notes]: https://grafana.com/docs/alloy/v1.12/release-notes/

#### Installation

Refer to our [installation guide] for how to install Grafana Alloy.

[installation guide]: https://grafana.com/docs/alloy/v1.12/get-started/install/
renovate bot added a commit to sdwilsh/sOS that referenced this pull request Jan 9, 2026
##### [\`v1.12.2\`](https://github.com/grafana/alloy/releases/tag/v1.12.2)

##### Bug Fixes 🐛

- Add missing configuration parameter `deployment_name_from_replicaset` to k8sattributes processor ([5b90a9d](grafana/alloy@5b90a9d)) ([@dehaansa](https://github.com/dehaansa))
- **database\_observability:** Fix schema\_details collector to fetch column definitions with case sensitive table names ([#4872](grafana/alloy#4872)) ([560dff4](grafana/alloy@560dff4)) ([@jharvey10](https://github.com/jharvey10), [@fridgepoet](https://github.com/fridgepoet))
- **deps:** Update jose2go to 1.7.0 ([#4858](grafana/alloy#4858)) ([dfdd341](grafana/alloy@dfdd341)) ([@jharvey10](https://github.com/jharvey10))
- **deps:** Update npm dependencies \[backport] ([#5201](grafana/alloy#5201)) ([8e06c26](grafana/alloy@8e06c26)) ([@jharvey10](https://github.com/jharvey10))
- Ensure the squid exporter wrapper properly brackets ipv6 addresses \[backport] ([#5205](grafana/alloy#5205)) ([e329cc6](grafana/alloy@e329cc6)) ([@dehaansa](https://github.com/dehaansa))
- Preserve meta labels in loki.source.podlogs ([#5097](grafana/alloy#5097)) ([ab4b21e](grafana/alloy@ab4b21e)) ([@kalleep](https://github.com/kalleep))
- Prevent panic in import.git when update fails \[backport] ([#5204](grafana/alloy#5204)) ([c82fbae](grafana/alloy@c82fbae)) ([@dehaansa](https://github.com/dehaansa), [@jharvey10](https://github.com/jharvey10))
- show correct fallback alloy version instead of v1.13.0 ([#5110](grafana/alloy#5110)) ([b72be99](grafana/alloy@b72be99)) ([@dehaansa](https://github.com/dehaansa), [@jharvey10](https://github.com/jharvey10))

#### Upgrading

Read the [release notes] for specific instructions on upgrading from older versions:

[release notes]: https://grafana.com/docs/alloy/v1.12/release-notes/

#### Installation

Refer to our [installation guide] for how to install Grafana Alloy.

[installation guide]: https://grafana.com/docs/alloy/v1.12/get-started/install/
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jan 9, 2026
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [grafana/alloy](https://github.com/grafana/alloy) | patch | `v1.12.1` → `v1.12.2` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>grafana/alloy (grafana/alloy)</summary>

### [`v1.12.2`](https://github.com/grafana/alloy/releases/tag/v1.12.2)

[Compare Source](grafana/alloy@v1.12.1...v1.12.2)

##### Bug Fixes 🐛

- Add missing configuration parameter `deployment_name_from_replicaset` to k8sattributes processor ([5b90a9d](grafana/alloy@5b90a9d)) ([@&#8203;dehaansa](https://github.com/dehaansa))
- **database\_observability:** Fix schema\_details collector to fetch column definitions with case sensitive table names ([#&#8203;4872](grafana/alloy#4872)) ([560dff4](grafana/alloy@560dff4)) ([@&#8203;jharvey10](https://github.com/jharvey10), [@&#8203;fridgepoet](https://github.com/fridgepoet))
- **deps:** Update jose2go to 1.7.0 ([#&#8203;4858](grafana/alloy#4858)) ([dfdd341](grafana/alloy@dfdd341)) ([@&#8203;jharvey10](https://github.com/jharvey10))
- **deps:** Update npm dependencies \[backport] ([#&#8203;5201](grafana/alloy#5201)) ([8e06c26](grafana/alloy@8e06c26)) ([@&#8203;jharvey10](https://github.com/jharvey10))
- Ensure the squid exporter wrapper properly brackets ipv6 addresses \[backport] ([#&#8203;5205](grafana/alloy#5205)) ([e329cc6](grafana/alloy@e329cc6)) ([@&#8203;dehaansa](https://github.com/dehaansa))
- Preserve meta labels in loki.source.podlogs ([#&#8203;5097](grafana/alloy#5097)) ([ab4b21e](grafana/alloy@ab4b21e)) ([@&#8203;kalleep](https://github.com/kalleep))
- Prevent panic in import.git when update fails \[backport] ([#&#8203;5204](grafana/alloy#5204)) ([c82fbae](grafana/alloy@c82fbae)) ([@&#8203;dehaansa](https://github.com/dehaansa), [@&#8203;jharvey10](https://github.com/jharvey10))
- show correct fallback alloy version instead of v1.13.0 ([#&#8203;5110](grafana/alloy#5110)) ([b72be99](grafana/alloy@b72be99)) ([@&#8203;dehaansa](https://github.com/dehaansa), [@&#8203;jharvey10](https://github.com/jharvey10))

#### Upgrading

Read the [release notes] for specific instructions on upgrading from older versions:

[release notes]: https://grafana.com/docs/alloy/v1.12/release-notes/

#### Installation

Refer to our [installation guide] for how to install Grafana Alloy.

[installation guide]: https://grafana.com/docs/alloy/v1.12/get-started/install/

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi43NS4xIiwidXBkYXRlZEluVmVyIjoiNDIuNzUuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6OnBhdGNoIl19-->
dadezzz pushed a commit to dadezzz/kubernetes that referenced this pull request Jan 9, 2026
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/grafana/alloy](https://github.com/grafana/alloy) | patch | `v1.12.1` → `v1.12.2` |

---

> ⚠️ **Warning**
>
> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>grafana/alloy (docker.io/grafana/alloy)</summary>

### [`v1.12.2`](https://github.com/grafana/alloy/releases/tag/v1.12.2)

[Compare Source](grafana/alloy@v1.12.1...v1.12.2)

##### Bug Fixes 🐛

- Add missing configuration parameter `deployment_name_from_replicaset` to k8sattributes processor ([5b90a9d](grafana/alloy@5b90a9d)) ([@&#8203;dehaansa](https://github.com/dehaansa))
- **database\_observability:** Fix schema\_details collector to fetch column definitions with case sensitive table names ([#&#8203;4872](grafana/alloy#4872)) ([560dff4](grafana/alloy@560dff4)) ([@&#8203;jharvey10](https://github.com/jharvey10), [@&#8203;fridgepoet](https://github.com/fridgepoet))
- **deps:** Update jose2go to 1.7.0 ([#&#8203;4858](grafana/alloy#4858)) ([dfdd341](grafana/alloy@dfdd341)) ([@&#8203;jharvey10](https://github.com/jharvey10))
- **deps:** Update npm dependencies \[backport] ([#&#8203;5201](grafana/alloy#5201)) ([8e06c26](grafana/alloy@8e06c26)) ([@&#8203;jharvey10](https://github.com/jharvey10))
- Ensure the squid exporter wrapper properly brackets ipv6 addresses \[backport] ([#&#8203;5205](grafana/alloy#5205)) ([e329cc6](grafana/alloy@e329cc6)) ([@&#8203;dehaansa](https://github.com/dehaansa))
- Preserve meta labels in loki.source.podlogs ([#&#8203;5097](grafana/alloy#5097)) ([ab4b21e](grafana/alloy@ab4b21e)) ([@&#8203;kalleep](https://github.com/kalleep))
- Prevent panic in import.git when update fails \[backport] ([#&#8203;5204](grafana/alloy#5204)) ([c82fbae](grafana/alloy@c82fbae)) ([@&#8203;dehaansa](https://github.com/dehaansa), [@&#8203;jharvey10](https://github.com/jharvey10))
- show correct fallback alloy version instead of v1.13.0 ([#&#8203;5110](grafana/alloy#5110)) ([b72be99](grafana/alloy@b72be99)) ([@&#8203;dehaansa](https://github.com/dehaansa), [@&#8203;jharvey10](https://github.com/jharvey10))

#### Upgrading

Read the [release notes] for specific instructions on upgrading from older versions:

[release notes]: https://grafana.com/docs/alloy/v1.12/release-notes/

#### Installation

Refer to our [installation guide] for how to install Grafana Alloy.

[installation guide]: https://grafana.com/docs/alloy/v1.12/get-started/install/

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi43MS4yIiwidXBkYXRlZEluVmVyIjoiNDIuNzEuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: Renovate Bot <renovate@zarantonello.dev>
Co-committed-by: Renovate Bot <renovate@zarantonello.dev>
renovate bot added a commit to sdwilsh/ansible-playbooks that referenced this pull request Jan 11, 2026
##### [\`v1.12.2\`](https://github.com/grafana/alloy/releases/tag/v1.12.2)

##### Bug Fixes 🐛

- Add missing configuration parameter `deployment_name_from_replicaset` to k8sattributes processor ([5b90a9d](grafana/alloy@5b90a9d)) ([@dehaansa](https://github.com/dehaansa))
- **database\_observability:** Fix schema\_details collector to fetch column definitions with case sensitive table names ([#4872](grafana/alloy#4872)) ([560dff4](grafana/alloy@560dff4)) ([@jharvey10](https://github.com/jharvey10), [@fridgepoet](https://github.com/fridgepoet))
- **deps:** Update jose2go to 1.7.0 ([#4858](grafana/alloy#4858)) ([dfdd341](grafana/alloy@dfdd341)) ([@jharvey10](https://github.com/jharvey10))
- **deps:** Update npm dependencies \[backport] ([#5201](grafana/alloy#5201)) ([8e06c26](grafana/alloy@8e06c26)) ([@jharvey10](https://github.com/jharvey10))
- Ensure the squid exporter wrapper properly brackets ipv6 addresses \[backport] ([#5205](grafana/alloy#5205)) ([e329cc6](grafana/alloy@e329cc6)) ([@dehaansa](https://github.com/dehaansa))
- Preserve meta labels in loki.source.podlogs ([#5097](grafana/alloy#5097)) ([ab4b21e](grafana/alloy@ab4b21e)) ([@kalleep](https://github.com/kalleep))
- Prevent panic in import.git when update fails \[backport] ([#5204](grafana/alloy#5204)) ([c82fbae](grafana/alloy@c82fbae)) ([@dehaansa](https://github.com/dehaansa), [@jharvey10](https://github.com/jharvey10))
- show correct fallback alloy version instead of v1.13.0 ([#5110](grafana/alloy#5110)) ([b72be99](grafana/alloy@b72be99)) ([@dehaansa](https://github.com/dehaansa), [@jharvey10](https://github.com/jharvey10))

#### Upgrading

Read the [release notes] for specific instructions on upgrading from older versions:

[release notes]: https://grafana.com/docs/alloy/v1.12/release-notes/

#### Installation

Refer to our [installation guide] for how to install Grafana Alloy.

[installation guide]: https://grafana.com/docs/alloy/v1.12/get-started/install/
renovate bot added a commit to sdwilsh/sOS that referenced this pull request Jan 16, 2026
##### [\`v1.12.2\`](https://github.com/grafana/alloy/releases/tag/v1.12.2)

##### Bug Fixes 🐛

- Add missing configuration parameter `deployment_name_from_replicaset` to k8sattributes processor ([5b90a9d](grafana/alloy@5b90a9d)) ([@dehaansa](https://github.com/dehaansa))
- **database\_observability:** Fix schema\_details collector to fetch column definitions with case sensitive table names ([#4872](grafana/alloy#4872)) ([560dff4](grafana/alloy@560dff4)) ([@jharvey10](https://github.com/jharvey10), [@fridgepoet](https://github.com/fridgepoet))
- **deps:** Update jose2go to 1.7.0 ([#4858](grafana/alloy#4858)) ([dfdd341](grafana/alloy@dfdd341)) ([@jharvey10](https://github.com/jharvey10))
- **deps:** Update npm dependencies \[backport] ([#5201](grafana/alloy#5201)) ([8e06c26](grafana/alloy@8e06c26)) ([@jharvey10](https://github.com/jharvey10))
- Ensure the squid exporter wrapper properly brackets ipv6 addresses \[backport] ([#5205](grafana/alloy#5205)) ([e329cc6](grafana/alloy@e329cc6)) ([@dehaansa](https://github.com/dehaansa))
- Preserve meta labels in loki.source.podlogs ([#5097](grafana/alloy#5097)) ([ab4b21e](grafana/alloy@ab4b21e)) ([@kalleep](https://github.com/kalleep))
- Prevent panic in import.git when update fails \[backport] ([#5204](grafana/alloy#5204)) ([c82fbae](grafana/alloy@c82fbae)) ([@dehaansa](https://github.com/dehaansa), [@jharvey10](https://github.com/jharvey10))
- show correct fallback alloy version instead of v1.13.0 ([#5110](grafana/alloy#5110)) ([b72be99](grafana/alloy@b72be99)) ([@dehaansa](https://github.com/dehaansa), [@jharvey10](https://github.com/jharvey10))

#### Upgrading

Read the [release notes] for specific instructions on upgrading from older versions:

[release notes]: https://grafana.com/docs/alloy/v1.12/release-notes/

#### Installation

Refer to our [installation guide] for how to install Grafana Alloy.

[installation guide]: https://grafana.com/docs/alloy/v1.12/get-started/install/
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 23, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants