Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-14667-fix-character-counter-on-staff-p…
Browse files Browse the repository at this point in the history
…rofile
  • Loading branch information
Becapa authored Feb 23, 2024
2 parents 4ab23fd + 8b75ef9 commit 2979ae8
Show file tree
Hide file tree
Showing 10 changed files with 1,068 additions and 61 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/default-branch-datadog-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
env:
GITHUB_REPOSITORY: "${{ github.repository }}"
- name: Send Metrics to DataDog.
uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0
uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
with:
api-key: ${{ secrets.DATADOG_API_KEY }}
api-url: https://api.ddog-gov.com
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
echo "Lines Denominator: ${lines_denominator}";
- name: Send Metrics to DataDog.
uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0
uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
with:
api-key: ${{ secrets.DATADOG_API_KEY }}
api-url: https://api.ddog-gov.com
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
echo "nonpublic_class_constants=$(jq '.nonPublicClassConstants' phploc.json)" >> $GITHUB_OUTPUT
- name: Send Metrics to DataDog.
uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0
uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
with:
api-key: ${{ secrets.DATADOG_API_KEY }}
api-url: https://api.ddog-gov.com
Expand Down
14 changes: 14 additions & 0 deletions READMES/devops/tugboat.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@ Shelling into the Tugboat server can be accomplished with `ssm-session tugboat u
2. Suspend older previews. This normally happens automatically (for Pull Request-based previews that haven't been touched in some period of time), but a flurry of previews might have been created inadvertently.
3. Consider upscaling the Tugboat server or migrating to an alternative architecture.

### Previews inaccessible
**Symptoms**: Requests to Tugboat previews, i.e. cms- pr pr- return 502/504 status codes or time out.

**Verification**:

1. Log into the Tugboat server (`ssm-session utility tugboat auto`).
2. Check system load and free memory (e.g. `top`).
3. If load is NOT incredibly high, and available memory is NOT very low, then the Tugboat server might be dealing with a proxy issue.

**Remediation**:

1. Run `tbctl restart proxy` and `tbctl restart traefik`


## 🚨 Warning 🚨

Note that the "training" environment (https://training.cms.va.gov/) is the source of truth for who has and who has not completed the editorial training; it should not be rebuilt or otherwise tampered with without previously discussing with Helpdesk.
10 changes: 6 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"composer/installers": "^2.2",
"consolidation/site-process": "^5.2",
"cweagans/composer-patches": "^1.7",
"datadog/dd-trace": "^0.97.0",
"datadog/dd-trace": "^0.98.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
"drupal/address": "^1.4",
"drupal/admin_feedback": "^2.2",
Expand All @@ -33,8 +33,8 @@
"drupal/better_exposed_filters": "^6.0",
"drupal/cer": "^5.0@beta",
"drupal/change_labels": "dev-3326097-remove-dependency-on-drupal-autoservices#7f92f90b456ac2f394dd434257e39e1d9b3086eb",
"drupal/clientside_validation": "^4.0",
"drupal/ckeditor_abbreviation": "^4.0@alpha",
"drupal/clientside_validation": "^4.0",
"drupal/coder": "^8.3",
"drupal/codit_menu_tools": "^1.0@alpha",
"drupal/components": "^3.0@beta",
Expand All @@ -60,6 +60,8 @@
"drupal/dropzonejs": "^2.0",
"drupal/dynamic_entity_reference": "^3.0",
"drupal/easy_breadcrumb": "^2.0",
"drupal/eca": "^1.1",
"drupal/eca_cm": "^1.0",
"drupal/embed": "^1.3",
"drupal/entity_block": "^1.0@beta",
"drupal/entity_browser": "^2.4",
Expand Down Expand Up @@ -132,7 +134,7 @@
"drupal/migrate_tools": "^6.0",
"drupal/migration_tools": "^2.8",
"drupal/mimemail": "^1.0@alpha",
"drupal/monolog": "^2.0",
"drupal/monolog": "^3.0",
"drupal/next": "^1.1",
"drupal/no_table_drag": "^2.0@alpha",
"drupal/node_link_report": "^1.14",
Expand Down Expand Up @@ -221,7 +223,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3444",
"va-gov/content-build": "^0.0.3445",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
Loading

0 comments on commit 2979ae8

Please sign in to comment.