Skip to content

Conversation

@isegall-da
Copy link
Contributor

@isegall-da isegall-da commented Oct 1, 2025

Tested manually by running infra up on a scratchnet and seeing grafana working afterwards, and seemingly happy with the postgres config:
Screenshot from 2025-10-01 16-30-50

(and when I got things wrong in how it's configured, it definitely was not happy)

cluster test for sanity that I didn't break anything

(this preflight also applied the change on scratchB, where I did not apply it manually before, and I confirmed after the run that it uses postgres there too, and seems to be working as expected)

Pull Request Checklist

Cluster Testing

  • If a cluster test is required, comment /cluster_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
  • If a hard-migration test is required (from the latest release), comment /hdm_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.

PR Guidelines

  • Include any change that might be observable by our partners or affect their deployment in the release notes.
  • Specify fixed issues with Fixes #n, and mention issues worked on using #n
  • Include a screenshot for frontend-related PRs - see README or use your favorite screenshot tool

Merge Guidelines

  • Make the git commit message look sensible when squash-merging on GitHub (most likely: just copy your PR description).

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
const project = gcp.organizations.getProjectOutput({});

// use existing default network (needs to have a private vpc connection)
export const privateNetwork = gcp.compute.Network.get(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In infra stack, we're already creating this resource, so when this is imported from infra stack, it triggers a duplicate resource error. AFAICT, all we need from here is the ID, so no real point in even creating this resource.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds plausible

"@pulumiverse/grafana": "0.16.3",
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0"
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0",
"@pulumi/gcp": "8.32.1"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not 100% sure why having this in common did not suffice, but it didn't...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

npm 🤷

{
dependsOn,
aliases: [
{ name: 'observabilty' }, // Legacy typo
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn, this one took me a while to figure out!

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
@isegall-da
Copy link
Contributor Author

/cluster_test

@github-actions
Copy link

github-actions bot commented Oct 1, 2025

Deploy cluster test triggered for Commit f760fab2809d369438ee81e87b16c06048b2669e in , please contact a Contributor to approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/34495

@isegall-da
Copy link
Contributor Author

@nicu-da if approved, please feel free to merge this and bump CILR to apply there

Copy link
Contributor

@moritzkiefer-da moritzkiefer-da left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice thank you!

# are currently deployed
# grep exits with return code 1 if it finds no matches so we account for that
query_result=$(kubectl get StatefulSets -A -o json 2> /dev/null | jq '.items[].spec.template.spec.containers[].image' | { grep -v prometheus || test $? = 1; })
query_result=$(kubectl get StatefulSets -A -o json 2> /dev/null | jq '.items[].spec.template.spec.containers[].image' | grep -v postgres | { grep -v prometheus || test $? = 1; })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is filtering out postgres ok? Isn't this one of the main stateful sets we have? It seems like we really should just filter out everything in the observability namespace no?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will push a fix for that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushed

const project = gcp.organizations.getProjectOutput({});

// use existing default network (needs to have a private vpc connection)
export const privateNetwork = gcp.compute.Network.get(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds plausible

"@pulumiverse/grafana": "0.16.3",
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0"
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0",
"@pulumi/gcp": "8.32.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

npm 🤷

[static]

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
@moritzkiefer-da moritzkiefer-da enabled auto-merge (squash) October 2, 2025 05:27
@moritzkiefer-da moritzkiefer-da merged commit dfe17c9 into main Oct 2, 2025
40 checks passed
@moritzkiefer-da moritzkiefer-da deleted the grafana-pg branch October 2, 2025 05:37
@isegall-da isegall-da mentioned this pull request Oct 2, 2025
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants