Skip to content

Commit 59b53e2

Browse files
committed
Merge branch 'main' into sync14to16
2 parents 0c44f4e + 2296dca commit 59b53e2

21 files changed

+45
-1314
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
name: Automatic doc checks
3+
4+
on:
5+
push:
6+
branches: [ main ]
7+
pull_request:
8+
paths:
9+
- 'docs/**' # Only run on changes to the docs directory
10+
11+
workflow_dispatch:
12+
# Manual trigger
13+
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
documentation-checks:
21+
uses: canonical/documentation-workflows/.github/workflows/documentation-checks.yaml@main
22+
with:
23+
working-directory: "docs"
24+
fetch-depth: 0

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- 'LICENSE'
1515
- '**.md'
1616
- .github/renovate.json5
17-
- '.github/workflows/sync_docs.yaml'
17+
- 'docs/**'
1818
schedule:
1919
- cron: '53 0 * * *' # Daily at 00:53 UTC
2020
# Triggered on push to branch "main" by .github/workflows/release.yaml

.github/workflows/lib-check.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- 'LICENSE'
1515
- '**.md'
1616
- 'renovate.json'
17+
- 'docs/**'
1718

1819
jobs:
1920
lib-check:

.github/workflows/sync_docs.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build/
66
__pycache__/
77
*.py[cod]
88
coverage.xml
9-
requirements.txt
9+
/requirements.txt
1010
requirements-last-build.txt
1111
.last_refresh_unit_status.json
1212

README.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
[![Tests](https://github.com/canonical/postgresql-operator/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/canonical/postgresql-operator/actions/workflows/ci.yaml?query=branch%3Amain)
55
[![codecov](https://codecov.io/gh/canonical/postgresql-operator/graph/badge.svg?token=4V2mu7aWmu)](https://codecov.io/gh/canonical/postgresql-operator)
66

7-
## Description
87

9-
This repository contains a [Juju Charm](https://charmhub.io/postgresql) for deploying [PostgreSQL](https://www.postgresql.org/about/) on virtual machines ([LXD](https://ubuntu.com/lxd)).
10-
To deploy on Kubernetes, please use [Charmed PostgreSQL K8s Operator](https://charmhub.io/postgresql-k8s).
8+
This repository contains a charmed operator for deploying [PostgreSQL](https://www.postgresql.org/about/) on virtual machines via the [Juju orchestration engine](https://juju.is/).
119

12-
This operator provides a PostgreSQL database with replication enabled: one primary instance and one (or more) hot standby replicas. The Operator in this repository is a Python script which wraps PostgreSQL versions distributed by Ubuntu Jammy series and adding [Patroni](https://github.com/zalando/patroni) on top of it, providing lifecycle management and handling events (install, configure, integrate, remove, etc).
10+
To learn more about how to deploy and operate Charmed PostgreSQL, see the [official documentation](https://canonical-charmed-postgresql.readthedocs-hosted.com/).
1311

14-
## README contents
12+
## Overview
1513

16-
* [Basic usage](#basic-usage): Deploy and scale Charmerd PostgreSQL
17-
* [Integrations](#integrations-relations): Supported interfaces for integrations
18-
* [Contributing](#contributing)
19-
* [Licensing and trademark](#licensing-and-trademark)
14+
This operator provides a PostgreSQL database with replication enabled: one primary instance and one (or more) hot standby replicas. The Operator in this repository is a Python script which wraps PostgreSQL versions distributed by Ubuntu Jammy series and adding [Patroni](https://github.com/zalando/patroni) on top of it, providing lifecycle management and handling events (install, configure, integrate, remove, etc).
2015

2116
## Basic usage
2217

docs/explanation.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ This section contains pages with more detailed explanations that provide additio
1010

1111
## Operational concepts
1212
* [Connection pooling]
13-
* [Units]
1413
* [Users]
1514
* [Logs]
1615

@@ -23,7 +22,6 @@ This section contains pages with more detailed explanations that provide additio
2322

2423
[Architecture]: /t/11857
2524
[Interfaces and endpoints]: /t/10251
26-
[Units]: /t/17525
2725
[Users]: /t/10798
2826
[Logs]: /t/12099
2927
[Juju]: /t/11985

docs/explanation/e-units.md

Lines changed: 0 additions & 93 deletions
This file was deleted.

docs/explanation/e-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Users
1+
# Charm Users explanations
22

33
There are three types of users in PostgreSQL:
44
* Internal users (used by charm operator)

docs/how-to.md

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ Specific deployment scenarios and architectures:
1717
* [Terraform]
1818
* [Air-gapped]
1919
* [TLS VIP access]
20-
* [Juju spaces]
21-
* [Air-gapped]
22-
* [Terraform]
23-
* [Juju storage]
2420

2521
## Usage and maintenance
2622

@@ -29,7 +25,6 @@ Specific deployment scenarios and architectures:
2925
* [Scale replicas]
3026
* [Enable TLS]
3127
* [Enable plugins/extensions]
32-
* [Switchover/failover]
3328

3429
## Backup and restore
3530
* [Configure S3 AWS]
@@ -41,10 +36,9 @@ Specific deployment scenarios and architectures:
4136

4237
## Monitoring (COS)
4338

44-
* [Enable monitoring] with Grafana
45-
* [Enable alert rules] with Prometheus
46-
* [Enable tracing] with Tempo
47-
* [Enable profiling] with Parca
39+
* [Enable monitoring]
40+
* [Enable alert rules]
41+
* [Enable tracing]
4842

4943
## Minor upgrades
5044
* [Perform a minor upgrade]
@@ -75,17 +69,13 @@ This section is for charm developers looking to support PostgreSQL integrations
7569
[GCE]: /t/15722
7670
[Azure]: /t/15733
7771
[Multi-AZ]: /t/15749
78-
[Juju spaces]: /t/17416
7972
[Terraform]: /t/14916
8073
[Air-gapped]: /t/15746
8174
[TLS VIP access]: /t/16576
82-
[Juju storage]: /t/17529
83-
8475
[Integrate with another application]: /t/9687
8576
[External access]: /t/15802
8677
[Scale replicas]: /t/9689
8778
[Enable TLS]: /t/9685
88-
[Switchover/failover]: /t/17523
8979

9080
[Configure S3 AWS]: /t/9681
9181
[Configure S3 RadosGW]: /t/10313
@@ -97,8 +87,7 @@ This section is for charm developers looking to support PostgreSQL integrations
9787
[Enable monitoring]: /t/10600
9888
[Enable alert rules]: /t/13084
9989
[Enable tracing]: /t/14521
100-
[Enable profiling]: /t/17172
101-
90+
10291
[Perform a minor upgrade]: /t/12089
10392
[Perform a minor rollback]: /t/12090
10493

0 commit comments

Comments
 (0)