Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(observability): deploy dev PostgreSQL query monitoring (#8123)
Wolf Mermelstein8d2d8138c9e3
diff --git a/infra/stacks/database-observability/Pulumi.dev.yaml b/infra/stacks/database-observability/Pulumi.dev.yamlnew file mode 100644index 0000000000..d704ece2d4--- /dev/null+++ b/infra/stacks/database-observability/Pulumi.dev.yaml@@ -0,0 +1,6 @@+config:+ aws:region: us-east-1+ database-observability:subnetId: subnet-0306dce66c915072a+ database-observability:ingestSecretArn: arn:aws:secretsmanager:us-east-1:569036502058:secret:observability/dev-ingest-7UhJbL+ database-observability:secretArn: arn:aws:secretsmanager:us-east-1:569036502058:secret:observability/dev-postgres-KHe9RE+ database-observability:amiId: ami-0fc11f7dc85b8d104diff --git a/infra/stacks/database-observability/README.md b/infra/stacks/database-observability/README.mdindex 0e09076ae8..78e805ac1c 100644--- a/infra/stacks/database-observability/README.md+++ b/infra/stacks/database-observability/README.md@@ -29,6 +29,10 @@ separately before expanding it.the reader. The script grants statistics access via `pg_monitor`, notapplication-table SELECT; it sets connection and query timeouts and defaultsto read-only transactions. It doesn't install extensions or restart RDS.+ Existing privileged roles are rejected; the script does not attempt to alter+ superuser-only attributes that the RDS administrator cannot change.+ Schema `USAGE` permits resolving the public extension views without granting+ SELECT on application tables.`pg_monitor` can read activity/query information, so treat this credential assensitive.3. On the same dev writer / macrodb connection, run@@ -50,8 +54,10 @@ separately before expanding it.5. Build the pinned collector image:`nix build ./infra/stacks/observability#database-collector --out-link result-database-collector`.Publish with- `python3 infra/stacks/observability/nixos/publish-image.py result-database-collector VIRGINIA_PRIVATE_IMAGE_BUCKET --region us-east-1 --name-prefix macro-database-collector`.+ `python3 infra/stacks/observability/nixos/publish-image.py result-database-collector macro-observability-images-569036502058-us-east-1 --region us-east-1 --name-prefix macro-database-collector --role macro-observability-vmimport`.The image is fixed; EC2 user data carries validated nonsecret settings only.+ AMI registration inherits the imported snapshot's minimum root volume size;+ the collector stack expands it to 12 GiB at launch.6. Initialize the separate Pulumi project here with a `dev` stack. Configure`aws:region=us-east-1`, `amiId`, `subnetId`, `secretArn`, and `ingestSecretArn`.The subnet must be private, in the database VPC, with outbound NAT/HTTPSdiff --git a/infra/stacks/database-observability/monitoring-role.sql b/infra/stacks/database-observability/monitoring-role.sqlindex 84edce5fa2..e30cae9620 100644--- a/infra/stacks/database-observability/monitoring-role.sql+++ b/infra/stacks/database-observability/monitoring-role.sql@@ -6,10 +6,18 @@ BEGINIF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'grafana_monitor') THENCREATE ROLE grafana_monitor LOGIN;END IF;+ IF EXISTS (+ SELECT FROM pg_roles WHERE rolname = 'grafana_monitor'+ AND (rolsuper OR rolcreatedb OR rolcreaterole OR rolreplication OR rolbypassrls)+ ) THEN+ RAISE EXCEPTION 'grafana_monitor must be an unprivileged monitoring role';+ END IF;END $$;-ALTER ROLE grafana_monitor NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION- NOBYPASSRLS CONNECTION LIMIT 5;+-- RDS administrators cannot change SUPERUSER attributes, even to disable them.+ALTER ROLE grafana_monitor LOGIN CONNECTION LIMIT 5;GRANT CONNECT ON DATABASE macrodb TO grafana_monitor;+-- Dev revokes PUBLIC schema access; USAGE resolves extension views, not app rows.+GRANT USAGE ON SCHEMA public TO grafana_monitor;GRANT pg_monitor TO grafana_monitor;ALTER ROLE grafana_monitor SET default_transaction_read_only = on;ALTER ROLE grafana_monitor SET statement_timeout = '5s';diff --git a/infra/stacks/observability/Pulumi.prod.yaml b/infra/stacks/observability/Pulumi.prod.yamlindex 51f9b03a4d..aff03f765a 100644--- a/infra/stacks/observability/Pulumi.prod.yaml+++ b/infra/stacks/observability/Pulumi.prod.yaml@@ -2,5 +2,5 @@ config:aws:region: us-east-2observability:ciIngestSecretArn: arn:aws:secretsmanager:us-east-1:569036502058:secret:observability/dev-ingest-7UhJbLobservability:alarmTopicArn: arn:aws:sns:us-east-2:569036502058:observability-prod-alerts- observability:amiId: ami-082c5befa76bfc246+ observability:amiId: ami-0e88a39db857c8c52observability:secretArn: arn:aws:secretsmanager:us-east-2:569036502058:secret:observability/prod-TwQpBJdiff --git a/infra/stacks/observability/README.md b/infra/stacks/observability/README.mdindex 6727f06624..d51de3801d 100644--- a/infra/stacks/observability/README.md+++ b/infra/stacks/observability/README.md@@ -289,7 +289,7 @@ From `infra/stacks/observability`, on an x86_64 Linux Nix builder:```bashnix build . --cores 2-python3 nixos/publish-image.py result '<private Ohio image-artifact bucket>'+python3 nixos/publish-image.py result macro-observability-images-569036502058-us-east-2 --role macro-observability-vmimport```The build produces a UEFI VHD with the complete host configuration. KVM speeds updiff --git a/infra/stacks/observability/nixos/publish-image.py b/infra/stacks/observability/nixos/publish-image.pyindex 42334dbaff..ebc29df679 100644--- a/infra/stacks/observability/nixos/publish-image.py+++ b/infra/stacks/observability/nixos/publish-image.py@@ -70,7 +70,7 @@ ami = aws('ec2', 'register-image', '--name', f'{args.name_prefix}-{digest[:20]}''--block-device-mappings', json.dumps([{'DeviceName': '/dev/xvda','Ebs': {'SnapshotId': snapshot, 'VolumeType': 'gp3',- 'VolumeSize': 30, 'DeleteOnTermination': True},+ 'DeleteOnTermination': True},}]))['ImageId']print(f'AMI: {ami}; SHA256: {digest}', flush=True)aws('ec2', 'create-tags', '--resources', ami, snapshot, '--tags',