Merge pull request #5505 from grafana/dev

dev -> main

Author: joeyorlando

.cursor/rules/planit-mode.mdc

@@ -0,0 +1,100 @@
+---
+description: A structured approach to task planning and execution for PlanIt tasks
+globs: 
+alwaysApply: false
+---
+# PlanIt Mode
+
+A structured approach to task planning and execution that emphasizes thorough analysis before action.
+
+## Core Philosophy
+Before diving into solutions:
+1. Take time to understand the full scope of the problem
+2. Look for existing similar solutions in the codebase
+3. Consider different approaches and their tradeoffs
+4. Think about potential edge cases and complications
+5. Question your initial assumptions
+
+## Execution Flow
+When a user message starts with "PlanIt:", ALWAYS follow this exact sequence:
+
+0. STOP AND THINK FIRST
+   - When you see "PlanIt:", this is a signal to pause and analyze
+   - DO NOT jump to conclusions or start planning immediately
+   - Take time to:
+     * Understand the full context
+     * Look for similar existing solutions
+     * Consider different approaches
+     * Question your assumptions
+     * Think about potential complications
+   - Only proceed to planning once you have a thorough understanding
+
+1. Initial Prompt Refinement:
+   - Review and analyze the initial prompt for clarity and completeness
+   - Look for ambiguities or unstated requirements
+   - Consider edge cases and potential complications
+   - Suggest improvements if needed
+   - Seek confirmation before proceeding with any suggested revisions
+
+2. Thoughtful Analysis Phase:
+   Before taking any action:
+   - Analyze task requirements thoroughly
+   - Review relevant parts of the codebase
+   - Look for similar existing solutions
+   - Consider different implementation approaches
+   - Document understanding and assumptions
+   - List potential challenges or edge cases
+   - Confirm understanding with user before proceeding
+
+3. Structured Planning and Progress Tracking:
+   - Create a detailed action plan in `.cursor_tasks.md` using this format:
+     ([Timestamp] should have date and time in hh:mm:ss)
+     ```markdown
+     # Task: [Task Name]
+     Created: [Timestamp]
+
+     ## Action Plan
+     - [ ] Step 1
+     - [ ] Step 2
+       - [ ] Substep 2.1
+       - [ ] Substep 2.2
+     - [ ] Step 3
+
+     ## Progress Notes
+     - [Timestamp] Started implementation of...
+     - [Timestamp] Completed step 1...
+     ```
+   - After creating the plan, STOP and ask the user: "Does this plan look good to you? Should I proceed with implementation?"
+   - Only proceed with implementation after explicit user approval
+   - Update the plan continuously as tasks progress
+   - Document any new steps identified during execution
+
+4. Continuous Learning and Adaptation:
+   - CRITICAL! If you make a mistake or get feedback, create or update cursor rules with your corrections!
+   - Document learnings and improvements
+   - Update approach based on new information
+
+## Best Practices
+1. Never rush to implementation
+2. Question your initial assumptions
+3. Look for existing solutions first
+4. Consider multiple approaches
+5. Think about edge cases early
+6. Maintain clear and specific communication
+7. Provide context for all decisions
+8. Use iterative refinement when needed
+9. Document all significant decisions and changes
+10. Keep the user informed of progress
+11. Seek clarification when requirements are ambiguous
+12. ALWAYS get user approval before starting implementation
+
+## Task Execution Flow
+1. Initial analysis and understanding
+2. Prompt refinement if needed
+3. Thorough exploration of existing solutions
+4. Create/update `.cursor_tasks.md`
+5. GET USER APPROVAL OF PLAN
+6. Execute planned steps
+7. Document progress and learnings
+8. Update plan as needed
+9. Seek user feedback at key points

engine/requirements-dev.txt

@@ -25,14 +25,14 @@ django==4.2.19
     #   django-stubs-ext
 django-filter-stubs==0.1.3
     # via -r requirements-dev.in
-django-stubs==4.2.2
+django-stubs[compatible-mypy]==4.2.2
     # via
     #   -r requirements-dev.in
     #   django-filter-stubs
     #   djangorestframework-stubs
 django-stubs-ext==4.2.7
     # via django-stubs
-djangorestframework-stubs==3.14.2
+djangorestframework-stubs[compatible-mypy]==3.14.2
     # via
     #   -r requirements-dev.in
     #   django-filter-stubs
@@ -99,7 +99,7 @@ pytest-factoryboy==2.7.0
     # via -r requirements-dev.in
 pytest-socket==0.7.0
     # via -r requirements-dev.in
-pytest-xdist==3.6.1
+pytest-xdist[psutil]==3.6.1
     # via -r requirements-dev.in
 python-dateutil==2.8.2
     # via
@@ -113,8 +113,6 @@ requests==2.32.3
     # via
     #   -c requirements.txt
     #   djangorestframework-stubs
-setuptools==75.3.0
-    # via nodeenv
 six==1.16.0
     # via
     #   -c requirements.txt
@@ -161,5 +159,5 @@ urllib3==1.26.19
     # via
     #   -c requirements.txt
     #   requests
-virtualenv==20.25.0
+virtualenv==20.26.6
     # via pre-commit

engine/requirements.in

@@ -58,7 +58,7 @@ slack_sdk==3.21.3
 social-auth-app-django==5.4.1
 twilio~=6.37.0
 urllib3==1.26.19
-uwsgi==2.0.26
+uwsgi==2.0.28
 whitenoise==5.3.0
 google-api-python-client==2.122.0
 google-auth-httplib2==0.2.0

engine/requirements.txt

@@ -414,6 +414,10 @@ rsa==4.9
     # via google-auth
 s3transfer==0.10.0
     # via boto3
+setuptools==76.0.0
+    # via
+    #   apscheduler
+    #   opentelemetry-instrumentation
 six==1.16.0
     # via
     #   apscheduler
@@ -459,7 +463,7 @@ urllib3==1.26.19
     #   botocore
     #   django-anymail
     #   requests
-uwsgi==2.0.26
+uwsgi==2.0.28
     # via -r requirements.in
 vine==5.1.0
     # via

grafana-plugin/go.mod

@@ -1,93 +1,94 @@
 module github.com/grafana/grafana-oncall-app
 
-go 1.21.5
+go 1.23.5
 
-require github.com/grafana/grafana-plugin-sdk-go v0.250.0
+require github.com/grafana/grafana-plugin-sdk-go v0.271.0
 
 require (
-	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/apache/arrow/go/v15 v15.0.2 // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/apache/arrow-go/v18 v18.0.1-0.20241212180703-82be143d7c30 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
-	github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/elazarl/goproxy v1.7.2 // indirect
 	github.com/fatih/color v1.15.0 // indirect
-	github.com/getkin/kin-openapi v0.124.0 // indirect
+	github.com/getkin/kin-openapi v0.129.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.8 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/flatbuffers v23.5.26+incompatible // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/flatbuffers v24.3.25+incompatible // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/grafana/otel-profiling-go v0.5.1 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
-	github.com/hashicorp/go-plugin v1.6.1 // indirect
+	github.com/hashicorp/go-plugin v1.6.3 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/magefile/mage v1.15.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattetti/filebuffer v1.0.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80 // indirect
+	github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.18 // indirect
-	github.com/prometheus/client_golang v1.20.3 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
 	github.com/unknwon/com v1.0.1 // indirect
 	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
-	github.com/urfave/cli v1.22.15 // indirect
+	github.com/urfave/cli v1.22.16 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect
-	go.opentelemetry.io/contrib/propagators/jaeger v1.29.0 // indirect
-	go.opentelemetry.io/contrib/samplers/jaegerremote v0.23.0 // indirect
-	go.opentelemetry.io/otel v1.29.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.29.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.29.0 // indirect
-	go.opentelemetry.io/otel/trace v1.29.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
-	google.golang.org/grpc v1.66.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.34.0 // indirect
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.28.0 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.36.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )