Skip to content

Add azmon-alert-noise-filter-snow recipe + deploy script fixes #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Deepthi Chelupati (dm-chelupati) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add azmon-alert-noise-filter-snow recipe + deploy script fixes #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 82 additions & 8 deletions sreagent-templates/bicep/Apply-Extras.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,22 +576,26 @@ if ($ghDomainCount -gt 0) {

# ═════════════════════════════════════════════════════════════════════════════
# 2. repos — data-plane only (requires azuresre.dev token)
# Split into byoapp_repos (domain has GitHubApp entry) and oauth_repos
# Split into byoapp_repos (domain has GitHubApp entry), gitlab_repos, and oauth_repos
# ═════════════════════════════════════════════════════════════════════════════
$repos = $extras.repos
$repoCount = ($repos | Measure-Object).Count
$oauthRepos = @()
$byoappRepos = @()
$gitlabRepos = @()
if ($repoCount -gt 0) {
if ($DpTokenAvailable) {
foreach ($repo in $repos) {
$rurl = $repo.spec.url
$rtype = if ($repo.spec.type) { $repo.spec.type } else { "" }
if ($rurl -match '^http') {
$rdomain = ([System.Uri]$rurl).Host
} else {
$rdomain = "github.com"
}
if ($byoappDomains -contains $rdomain) {
if ($rdomain -like "*gitlab*" -or $rtype -ieq "GitLab") {
$gitlabRepos += $repo
} elseif ($byoappDomains -contains $rdomain) {
$byoappRepos += $repo
} else {
$oauthRepos += $repo.name
Expand All @@ -600,6 +604,9 @@ if ($repoCount -gt 0) {
if ($byoappRepos.Count -gt 0) {
Write-Host "repos: $($byoappRepos.Count) via BYO App (will be wired after githubDomains)"
}
if ($gitlabRepos.Count -gt 0) {
Write-Host "repos: $($gitlabRepos.Count) via GitLab PAT (will be wired after gitlab/auth)"
}
if ($oauthRepos.Count -gt 0) {
Write-Host "repos: $($oauthRepos.Count) via OAuth (will be wired after GitHub sign-in below)"
}
Expand Down Expand Up @@ -886,18 +893,43 @@ if ($saCount -gt 0) {
}

# ═════════════════════════════════════════════════════════════════════════════
# 4g-3. tools — data-plane PUT
# Route: PUT /api/v2/extendedAgent/tools/{name}
# 4g-3. tools — data-plane POST via /api/v1/extendedAgent/apply (ToolList kind)
# Route: POST /api/v1/extendedAgent/apply
# ═════════════════════════════════════════════════════════════════════════════
$toolItems = if ($extras.PSObject.Properties['tools']) { $extras.tools } else { $null }
$tlCount = ($toolItems | Measure-Object).Count
if ($tlCount -gt 0) {
if ($DpTokenAvailable) {
Write-Host "tools: $tlCount"
foreach ($tl in $toolItems) {
$name = if ($tl.metadata) { $tl.metadata.name } else { $tl.name }
$props = if ($tl.spec) { $tl.spec } else { $tl.properties }
DataPlane-PutExtended -Kind "tools" -Name $name -Type "Tool" -Tags @() -Properties $props
$token = Get-DpToken
# Build ToolList YAML document
$toolList = @{
api_version = "azuresre.ai/v1"
kind = "ToolList"
metadata = @{}
spec = @{
tools = @(foreach ($tl in $toolItems) {
$name = if ($tl.metadata) { $tl.metadata.name } else { $tl.name }
$spec = if ($tl.spec) { $tl.spec } else { $tl.properties }
@{ metadata = @{ name = $name }; spec = $spec }
})
}
}
# Convert to YAML-like format (use JSON as fallback, apply endpoint accepts both)
$toolsBody = $toolList | ConvertTo-Json -Depth 20
try {
$null = Invoke-RestMethod -Uri "$AgentEndpoint/api/v1/extendedAgent/apply" `
-Method Put -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
-Body $toolsBody -ErrorAction Stop
Write-Host " ok tools ($tlCount via apply endpoint)"
} catch {
Write-Host " FAILED — PUT /api/v1/extendedAgent/apply (ToolList)"
# Fallback: try individual v2 PUT
foreach ($tl in $toolItems) {
$name = if ($tl.metadata) { $tl.metadata.name } else { $tl.name }
$props = if ($tl.spec) { $tl.spec } else { $tl.properties }
DataPlane-PutExtended -Kind "tools" -Name $name -Type "Tool" -Tags @() -Properties $props
}
}
} else {
Write-Host "tools: $tlCount - WARNING skipped (no data-plane token)"
Expand Down Expand Up @@ -1153,6 +1185,48 @@ if ($DpTokenAvailable) {
}
}

# ─────────────────────────────────────────────────────────────────────────
# GitLab repos — authenticate via PAT then push repos
# ─────────────────────────────────────────────────────────────────────────
if ($gitlabRepos.Count -gt 0) {
$gitlabPat = $env:GITLAB_PAT
if ($gitlabPat) {
Write-Host "gitlab repos: $($gitlabRepos.Count)"
$token = Get-DpToken
# Store GitLab PAT
try {
$null = Invoke-RestMethod -Uri "$AgentEndpoint/api/v2/gitlab/auth" `
-Method Put -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
-Body (@{ pat = $gitlabPat } | ConvertTo-Json -Compress) -ErrorAction Stop
Write-Host " ok gitlab/auth (PAT stored)"
} catch {
Write-Host " FAILED - PUT /api/v2/gitlab/auth"
}
# Push repos
foreach ($repo in $gitlabRepos) {
$rname = $repo.name
$rurl = $repo.spec.url
if ($rurl -notmatch '^http' -and $rurl -match '/') {
$rurl = "https://gitlab.com/$rurl"
}
$rdesc = if ($repo.spec.description) { $repo.spec.description } else { "" }
$rbody = @{ name = $rname; type = "CodeRepo"; properties = @{ url = $rurl; type = "GitLab" } }
if ($rdesc) { $rbody.properties.description = $rdesc }
$rbodyJson = $rbody | ConvertTo-Json -Depth 5 -Compress
try {
$null = Invoke-RestMethod -Uri "$AgentEndpoint/api/v2/repos/$([Uri]::EscapeDataString($rname))" `
-Method Put -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
-Body $rbodyJson -ErrorAction Stop
Write-Host " ok repo/$rname ($rurl) [GitLab]"
} catch {
Write-Host " FAILED - PUT /api/v2/repos/$rname (try the portal Repos blade)"
}
}
} else {
Write-Host "gitlab repos: $($gitlabRepos.Count) - WARNING skipped (GITLAB_PAT not set)"
}
}

# ─────────────────────────────────────────────────────────────────────────
# GitHub: OAuth sign-in + connector + repo wiring.
# ─────────────────────────────────────────────────────────────────────────
Expand Down
Loading
Loading