Merge branch 'main' into patch-1

GSA · Jan 10, 2025 · 74ac8a9 · 74ac8a9
2 parents 2d70e1c + 7ede51e
commit 74ac8a9
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Ignore minor and patch updates
+      - dependency-name: "*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+    groups:
+      # Group all updates together
+      github-actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
@@ -42,7 +42,7 @@ jobs:
     environment: ${{inputs.environ}}
     steps:
       - name: checkout datagov
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: './catalog'
       - name: run task
@@ -55,7 +55,7 @@ jobs:
           cf_password: ${{secrets.CF_SERVICE_AUTH}}
       - name: Send notification to Slack
         if: ${{ inputs.notification }}
-        uses: slackapi/slack-github-action@v1.25.0
+        uses: slackapi/slack-github-action@v2
         with:
           payload: |
             {

diff --git a/ckan/requirements.txt b/ckan/requirements.txt
@@ -74,7 +74,7 @@ psycopg2==2.9.3
 pycparser==2.22
 PyJWT==2.4.0
 pyOpenSSL==24.3.0
-pyparsing==3.2.0
+pyparsing==3.2.1
 pyproj==3.4.1
 pysaml2==7.0.1
 pysolr==3.9.0

diff --git a/manifest.yml b/manifest.yml
@@ -122,6 +122,7 @@ applications:
     no-route: true
     instances: ((fetch-instances))
     disk_quota: 1.5G
+    memory: ((fetch_memory_quota))
     command: newrelic-admin run-program sh -c 'while ! ckan harvester fetch-consumer; do sleep 10; done'
     health-check-type: process
     timeout: 15

diff --git a/vars.development.yml b/vars.development.yml
@@ -12,6 +12,7 @@ fetch-instances: 1
 proxy-instances: 1
 memory_quota: 750M
 gather_memory_quota: 1G
+fetch_memory_quota: 300M
 
 new_relic_monitor_mode: false
 

diff --git a/vars.prod.yml b/vars.prod.yml
@@ -8,10 +8,11 @@ ckanext__saml2auth__idp_metadata__local_path: ckan/setup/login.production.idp.xm
 web-instances: 3
 admin-instances: 1
 gather-instances: 1
-fetch-instances: 4
+fetch-instances: 3
 proxy-instances: 2
 memory_quota: 800M
 gather_memory_quota: 3G
+fetch_memory_quota: 500M
 
 new_relic_monitor_mode: true
 

diff --git a/vars.staging.yml b/vars.staging.yml
@@ -12,6 +12,7 @@ fetch-instances: 1
 proxy-instances: 1
 memory_quota: 750M
 gather_memory_quota: 3G
+fetch_memory_quota: 500M
 
 new_relic_monitor_mode: true