Skip to content

Commit

Permalink
Merge pull request #4426 from alphagov/sengi/rm-puppet
Browse files Browse the repository at this point in the history
Remove some obsolete Puppet-related info.
  • Loading branch information
sengi authored Jan 30, 2024
2 parents 9cf9ea2 + 63f5bf2 commit 20c71fc
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 116 deletions.
45 changes: 0 additions & 45 deletions source/manual/common-aws-tasks-for-2nd-line-support.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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/
61 changes: 0 additions & 61 deletions source/manual/kibana.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions source/manual/logit.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <environment> EKS`.

There are also separate stacks for the legacy EC2/Puppet environments, named
`GOV.UK <environment> AWS`.

### Alternative login method

1. Go to [https://dashboard.logit.io/sign-in](https://dashboard.logit.io/sign-in).
Expand Down
7 changes: 0 additions & 7 deletions source/partials/repo/_hosting.html.erb

This file was deleted.

0 comments on commit 20c71fc

Please sign in to comment.