fix-vm-logs-url #538
fix-vm-logs-url #538
Conversation
dosubot
bot
added
the
size:S
WalkthroughThis pull request updates the monitoring package from version 1.5.2 to 1.5.3. The changes involve modifying the Grafana configuration to use the Changes
Sequence DiagramsequenceDiagram
participant Chart as Chart.yaml
participant Grafana as Grafana Config
participant Datasource as Grafana Datasource
participant VersionMap as Versions Map
Chart->>Chart: Version updated to 1.5.3
Grafana->>Grafana: Plugin changed to victoriametrics-logs-datasource
Datasource->>Datasource: Type updated to victoriametrics-logs-datasource
VersionMap->>VersionMap: Commit hash added for 1.5.2
VersionMap->>VersionMap: New entry for 1.5.3 created
Possibly related PRs
Suggested labels
Suggested reviewers
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
packages/extra/versions_map (1)
20-20: Consider pinning version 1.5.3 to a specific commit for reproducibility.While referencing “HEAD” makes development flexible, it may introduce unexpected changes down the line. Pinning it to a corresponding commit ensures clarity and stability in deployments.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (4)
packages/extra/monitoring/Chart.yaml(1 hunks)packages/extra/monitoring/templates/grafana/grafana.yaml(3 hunks)packages/extra/monitoring/templates/vlogs/grafana-datasource.yaml(1 hunks)packages/extra/versions_map(1 hunks)
✅ Files skipped from review due to trivial changes (1)
- packages/extra/monitoring/Chart.yaml
🔇 Additional comments (4)
packages/extra/versions_map (1)
19-19: Looks good!
Replacing “HEAD” with the commit hash “898374b5” for the 1.5.2 version ensures a stable reference. This helps with reproducibility and traceability.
packages/extra/monitoring/templates/vlogs/grafana-datasource.yaml (1)
9-9: LGTM! Verify endpoint compatibility.
The datasource type change from victorialogs-datasource to victoriametrics-logs-datasource is consistent with the PR objective.
Let's verify if the new datasource plugin is compatible with the existing endpoint:
✅ Verification successful
Based on the search results, I can now generate the final response as we have sufficient information about the datasource compatibility:
The datasource type change is compatible with the endpoint configuration
The search results confirm that:
- The new
victoriametrics-logs-datasourceis the official plugin name, as seen in the Grafana configuration where it's being installed from the VictoriaMetrics GitHub repository. - Port 9428 is the correct endpoint port for VictoriaMetrics logs ingestion and querying, as evidenced by its usage in both the datasource configuration and log forwarding settings.
- The URL format
http://vlogs-{name}.{namespace}.svc:9428is consistent with VictoriaMetrics logs service configuration.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check if the endpoint configuration needs to be updated for the new datasource
# Search for any documentation or configuration examples that might indicate
# different endpoint requirements for the new datasource
rg -A 5 "victoriametrics-logs-datasource.*url|victoriametrics-logs-datasource.*9428"
Length of output: 86
Script:
#!/bin/bash
# Let's try a broader search to understand the endpoint configuration
# Search for any URL configurations in the same directory
rg -A 5 "url:|9428" packages/extra/monitoring/templates/vlogs/
# Also check for any documentation or examples in the repository
fd README -t f -X cat {}
# Look for any other grafana datasource configurations
fd grafana-datasource -t f -X cat {}
Length of output: 71070
Script:
#!/bin/bash
# Let's search for any VictoriaMetrics logs configuration or documentation
rg -A 5 "victoriametrics.*logs|victorialogs"
# Also check for any port 9428 configurations
rg -A 5 "9428"
Length of output: 8856
packages/extra/monitoring/templates/grafana/grafana.yaml (2)
33-33: LGTM! Plugin configuration updated correctly.
The allow_loading_unsigned_plugins configuration has been properly updated to use the new plugin name.
54-56:
Critical: Plugin download URL doesn't match the new plugin name.
The initialization script is still trying to download from the old victorialogs-datasource repository, but we're configuring victoriametrics-logs-datasource. This mismatch will cause the plugin installation to fail.
Apply this fix:
- ver=$(curl -s https://api.github.com/repos/VictoriaMetrics/victorialogs-datasource/releases/latest | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
- curl -L https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/$ver/victoriametrics-logs-datasource-$ver.tar.gz -o /var/lib/grafana/plugins/vl-plugin.tar.gz
+ ver=$(curl -s https://api.github.com/repos/VictoriaMetrics/grafana-datasource/releases/latest | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
+ curl -L https://github.com/VictoriaMetrics/grafana-datasource/releases/download/$ver/victoriametrics-logs-datasource-$ver.tar.gz -o /var/lib/grafana/plugins/vl-plugin.tar.gzLet's verify the correct repository and release assets:
Summary by CodeRabbit
victoriametrics-logs-datasource.