From 63f5bf2d1cd9615e638233dd054e3daf728c7091 Mon Sep 17 00:00:00 2001 From: Chris Banks Date: Tue, 30 Jan 2024 13:37:24 +0000 Subject: [PATCH] Remove some obsolete Puppet-related info. Delete some paragraphs/sections that are obsolete now that we no longer run Puppet, Jenkins etc. --- ...mon-aws-tasks-for-2nd-line-support.html.md | 45 -------------- source/manual/kibana.html.md | 61 ------------------- source/manual/logit.html.md | 3 - source/partials/repo/_hosting.html.erb | 7 --- 4 files changed, 116 deletions(-) delete mode 100644 source/partials/repo/_hosting.html.erb diff --git a/source/manual/common-aws-tasks-for-2nd-line-support.html.md b/source/manual/common-aws-tasks-for-2nd-line-support.html.md index 379d5a3030..139e8909da 100644 --- a/source/manual/common-aws-tasks-for-2nd-line-support.html.md +++ b/source/manual/common-aws-tasks-for-2nd-line-support.html.md @@ -84,29 +84,6 @@ View the documentation on [how to backup and restore in AWS RDS]. [how to backup and restore in AWS RDS]: /manual/howto-backup-and-restore-in-aws-rds.html -## How to resize a persistent disk - -If you're not sure how to do this, ask an Site Reliability Engineer to give you a walk through. - -See the docs: /manual/manually-resize-ebs.html. - -## How to replace an instance with a persistent disk - -_If you're not sure how to do this, ask an Site Reliability Engineer to give -you a walk through._ - -Assuming we want to destroy and recreate a VM, but have the new VM attach to the -old persistent disk - -1. Find the VM and note down the details of the persistent volume you want to keep -1. Shutdown the VM -1. Detach the EBS volume from the VM. -1. Delete the VM -1. Run terraform apply which will now recreate the VM -1. Manually re-attach the EBS volume to the new VM -1. Reboot the machine to make sure the persistent disk reattaches between reboots -1. Initiate a puppet run to make sure that everything works - ## Learn ### How do we do DNS? @@ -116,26 +93,4 @@ example service.gov.uk. See [how GOV.UK does DNS](/manual/dns.html). -## How are EC2 instances (legacy infrastructure) provisioned? - -**As of Mar 2023, only Crawler, CKAN (for data.gov.uk) and Licensing still use -the legacy EC2 infrastructure.** - -The legacy EC2 infrastructure is configured via Terraform code in the -[govuk-aws] repo. - -There are a few exceptions to this, such as ad-hoc instances started from -Concourse via the AWS CLI - these are mainly for data science projects. - -We use [userdata scripts] to run commands on our instances at launch. These -scripts install various core bits of software needed by a particular instance -and then typically use [govuk-puppet] to provision our instances. - -Finally, new instances send Jenkins their Fully Qualified Domain Name (FQDN) -and puppet class. Jenkins automatically [deploys apps] to newly provisioned -instances. - [govuk-aws]: https://github.com/alphagov/govuk-aws -[userdata scripts]: https://github.com/alphagov/govuk-aws/blob/master/terraform/userdata/20-puppet-client -[govuk-puppet]: https://github.com/alphagov/govuk-puppet -[deploys apps]: https://deploy.integration.publishing.service.gov.uk/job/Deploy_Node_Apps/ diff --git a/source/manual/kibana.html.md b/source/manual/kibana.html.md index a2e3dadc50..40ec007ffd 100644 --- a/source/manual/kibana.html.md +++ b/source/manual/kibana.html.md @@ -56,37 +56,6 @@ tags: request AND path: \/government\/groups\/* host:cache* AND (@fields.status:[500 TO 504] OR status:[500 TO 504]) ``` -### Puppet runs - -```rb -# both agent and master -syslog_program:puppet* - -# agent only -syslog_program:"puppet-agent" - -# master only -syslog_program:"puppet-master" -``` - -### Syslog logs - -```rb -application:"syslog" -``` - -### Syslog logs on a specific machine - -```rb -source:"/var/log/syslog" AND beat.hostname:"ip-10-13-5-15" -``` - -### Syslog logs filtered by program - -```rb -application:"syslog" AND syslog_program:"rsync" -``` - ### Nginx logs ```rb @@ -103,18 +72,6 @@ tags:"nginx" AND application:frontend* > > The `@timestamp` field records the request END time. To calculate request start time subtract `request_time`. -### Application upstart logs - -```rb -tags:"upstart" - -tags:"upstart" AND tags:"stdout" - -tags:"upstart" AND tags:"stderr" - -tags:"upstart" AND application:"licensify" -``` - ### Application production.log files ```rb @@ -129,12 +86,6 @@ tags:"application" AND application:"smartanswers" application:"mongodb" AND message:"command" ``` -### Audit/access logs - -```rb -application:"syslog" AND syslog_program:"audispd" -``` - ### Mirrorer logs ```rb @@ -226,18 +177,6 @@ Press the "Play" icon to run the query, whose results will appear in the panel o You'll see a `hits` array for each matching record, and also an `aggregations` object where your aggregations are grouped into `buckets`. From here it should be quite simple to count the number of unique IPs. -## Syslog program names - -If you're looking for specific program outputs, use `syslog_program:FOO`: - -- `audispd`: This is used to see all audit logs from various servers. You can refer to README for searching particular types of audit logs. The program name with combination of source_host and message can be helped for looking at various specific audit log lines on a server. -- `clamd` -- `cron` -- `govuk_sync_mirror`: Records information from govuk_sync_mirror script -- `puppet-agent`: Records output for govuk_puppet script on various servers -- `puppet-master` -- `smokey` - ## Gotchas - Score: does a aggregation of field on last 2000 results diff --git a/source/manual/logit.html.md b/source/manual/logit.html.md index 2a5cb9d891..ec54654265 100644 --- a/source/manual/logit.html.md +++ b/source/manual/logit.html.md @@ -34,9 +34,6 @@ From the Logit Dashboard page, choose Launch Kibana for the appropriate stack. Each environment (production, staging, integration) has its own ELK stack in Logit named `GOV.UK EKS`. -There are also separate stacks for the legacy EC2/Puppet environments, named -`GOV.UK AWS`. - ### Alternative login method 1. Go to [https://dashboard.logit.io/sign-in](https://dashboard.logit.io/sign-in). diff --git a/source/partials/repo/_hosting.html.erb b/source/partials/repo/_hosting.html.erb deleted file mode 100644 index 10ad8fbb2f..0000000000 --- a/source/partials/repo/_hosting.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if repo.production_hosted_on == "aws" %> - <%= repo.hosting_name %>, on the <%= repo.aws_puppet_class %> machine class -<% elsif repo.is_app? %> - <%= repo.hosting_name %> -<% else %> - N/A -<% end %>