From 9f50fbe71421ccb97e88c6fbf40cb5caa41846dc Mon Sep 17 00:00:00 2001 From: Dan Lemon Date: Thu, 7 Jan 2021 14:41:56 +0100 Subject: [PATCH] Update node-packages/services info with main branch/envs instead of master --- node-packages/commons/src/harborApi.ts | 2 +- node-packages/commons/src/tasks.ts | 4 ++-- openshift-setup/docker-host.yaml | 6 +++--- services/api/README.md | 4 ++-- services/api/src/clients/keycloakClient.js | 4 ++-- services/api/src/gitlab-sync/projects.ts | 2 +- services/api/src/mocks.js | 12 ++++++------ .../resources/billing/billingCalculations.test.ts | 2 +- services/api/src/resources/group/resolvers.test.ts | 4 ++-- services/api/src/typeDefs.js | 2 +- services/auth-server/README.md | 4 ++-- services/logs2email/README.md | 4 ++-- services/logs2microsoftteams/README.md | 6 +++--- services/logs2rocketchat/README.md | 4 ++-- services/logs2slack/README.md | 4 ++-- services/ssh/README.md | 4 ++-- services/ui/.storybook/lagoonTheme.js | 4 ++-- .../components/ActiveStandbyConfirm/index.stories.js | 4 ++-- services/ui/src/components/BillingGroup/data.json | 4 ++-- .../ui/src/components/BillingGroupBarChart/data.json | 8 ++++---- .../ui/src/components/BillingGroupProjects/data.json | 4 ++-- .../ui/src/components/DeployLatest/index.stories.js | 2 +- services/webhook-handler/README.md | 4 ++-- .../lagoon-webhook-handler.postman_collection.json | 2 +- services/webhooks2tasks/README.md | 4 ++-- .../src/handlers/gitlabProjectCreate.ts | 4 ++-- .../src/handlers/gitlabProjectUpdate.ts | 4 ++-- .../src/handlers/resticbackupSnapshotFinished.ts | 8 ++++---- 28 files changed, 60 insertions(+), 60 deletions(-) diff --git a/node-packages/commons/src/harborApi.ts b/node-packages/commons/src/harborApi.ts index 0bb146e2ba..47a413f620 100644 --- a/node-packages/commons/src/harborApi.ts +++ b/node-packages/commons/src/harborApi.ts @@ -5,7 +5,7 @@ import * as R from 'ramda'; const HARBOR_BASE_API_URL = process.env.HARBOR_BASE_API_URL || - 'https://harbor-nginx-lagoon-master.ch.amazee.io/api/repositories/'; + 'https://harbor-nginx-lagoon-main.ch.amazee.io/api/repositories/'; const HARBOR_BASE_URL_POSTFIX = '/tags/latest/scan'; const HARBOR_ACCEPT_HEADER = 'application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0'; diff --git a/node-packages/commons/src/tasks.ts b/node-packages/commons/src/tasks.ts index 5378e8d069..2424480195 100644 --- a/node-packages/commons/src/tasks.ts +++ b/node-packages/commons/src/tasks.ts @@ -97,7 +97,7 @@ const taskMonitorPrefetch = process.env.TASKMONITOR_PREFETCH_COUNT ? Number(proc // * `webhooks2tasks` const CI = process.env.CI || "false" const registry = process.env.REGISTRY || "registry.lagoon.svc:5000" -const lagoonGitSafeBranch = process.env.LAGOON_GIT_SAFE_BRANCH || "master" +const lagoonGitSafeBranch = process.env.LAGOON_GIT_SAFE_BRANCH || "main" const lagoonVersion = process.env.LAGOON_VERSION const lagoonEnvironmentType = process.env.LAGOON_ENVIRONMENT_TYPE || "development" const overwriteOCBuildDeployDindImage = process.env.OVERWRITE_OC_BUILD_DEPLOY_DIND_IMAGE @@ -466,7 +466,7 @@ export const createDeployTask = async function(deployData: any) { // environments = // { project: // { environment_deployments_limit: 1, - // production_environment: 'master', + // production_environment: 'main', // environments: [ { name: 'develop', environment_type: 'development' }, [Object] ] } } if (typeof project.activeSystemsDeploy === 'undefined') { diff --git a/openshift-setup/docker-host.yaml b/openshift-setup/docker-host.yaml index b584a80aec..dd2fe31d9c 100644 --- a/openshift-setup/docker-host.yaml +++ b/openshift-setup/docker-host.yaml @@ -12,16 +12,16 @@ parameters: value: docker-host - name: SAFE_BRANCH description: Which branch this belongs to, special chars replaced with dashes - value: master + value: main - name: SAFE_PROJECT description: Which project this belongs to, special chars replaced with dashes value: lagoon - name: BRANCH description: Which branch this belongs to, original value - value: master + value: main - name: PROJECT description: Which project this belongs to, original value - value: master + value: main - name: LAGOON_GIT_SHA description: git hash sha of the current deployment value: '0000000000000000000000000000000000000000' diff --git a/services/api/README.md b/services/api/README.md index f6501fe438..d5942d89b2 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -29,4 +29,4 @@ The main GraphQL API for Lagoon. Uses the [Apollo server library](https://www.ap * Query/Muation documented via API introspection, supported in most GraphQL clients. -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/api/src/clients/keycloakClient.js b/services/api/src/clients/keycloakClient.js index de7d3ec474..0956260b0c 100644 --- a/services/api/src/clients/keycloakClient.js +++ b/services/api/src/clients/keycloakClient.js @@ -11,7 +11,7 @@ const ConnectionConfig = { }; const Credentials = { - realmName: 'master', + realmName: 'main', username: 'admin', password: R.pathOr('', ['env', 'KEYCLOAK_ADMIN_PASSWORD'], process), grantType: 'password', @@ -42,7 +42,7 @@ const config = new KeycloakConfig({ const keycloakGrantManager = new KeycloakGrantManager(config); // Override the library "validateToken" function because it is very strict about -// verifiying the ISS, which is the URI of the keycloak server. This will almost +// verifying the ISS, which is the URI of the keycloak server. This will almost // always fail since the URI will be different for end users authenticated via // the web console and services communicating via backchannel. keycloakGrantManager.validateToken = function validateToken(token, expectedType) { diff --git a/services/api/src/gitlab-sync/projects.ts b/services/api/src/gitlab-sync/projects.ts index 2c3292825e..3c8aab6659 100644 --- a/services/api/src/gitlab-sync/projects.ts +++ b/services/api/src/gitlab-sync/projects.ts @@ -28,7 +28,7 @@ const syncProject = async (project) => { const { id, path, ssh_url_to_repo: gitUrl, namespace } = project; const projectName = api.sanitizeProjectName(path); const openshift = 1; - const productionenvironment = "master"; + const productionenvironment = "main"; logger.debug(`Processing ${projectName}`); if (project.namespace.kind != 'group') { diff --git a/services/api/src/mocks.js b/services/api/src/mocks.js index 64e2382954..c671f55a8e 100644 --- a/services/api/src/mocks.js +++ b/services/api/src/mocks.js @@ -228,9 +228,9 @@ MIIJKQIBAAKCAgEA+o[...]P0yoL8BoQQG2jCvYfWh6vyglQdrDYx/o6/8ecTwXokKKh6fg1q activeSystemsPromote: 'lagoon_controllerBuildDeploy', activeSystemsRemove: 'lagoon_controllerRemove', activeSystemsTask: 'lagoon_controllerJob', - branches: faker.random.arrayElement(['true', 'false', '^(master|staging)$']), + branches: faker.random.arrayElement(['true', 'false', '^(main|staging)$']), pullrequests: faker.random.arrayElement(['true', 'false', '[BUILD]']), - productionEnvironment: 'master', + productionEnvironment: 'main', autoIdle: faker.random.arrayElement([0, 1]), storageCalc: faker.random.arrayElement([0, 1]), problemsUi: faker.random.arrayElement([0, 1]), @@ -252,7 +252,7 @@ MIIJKQIBAAKCAgEA+o[...]P0yoL8BoQQG2jCvYfWh6vyglQdrDYx/o6/8ecTwXokKKh6fg1q mocks.Environment = (parent, args = {}, context, info) => { const name = args.hasOwnProperty('name') ? args.name - : faker.random.arrayElement(['master', 'staging', 'development', 'pr-42', 'pr-100', 'pr-175']); + : faker.random.arrayElement(['main', 'staging', 'development', 'pr-42', 'pr-100', 'pr-175']); let deployType, deployBaseRef, deployHeadRef; if (/^pr\-/.test(name)) { deployType = 'pullrequest'; @@ -277,7 +277,7 @@ mocks.Environment = (parent, args = {}, context, info) => { deployHeadRef, deployTitle: name, autoIdle: faker.random.arrayElement([0, 1]), - environmentType: name === 'master' ? 'production' : 'development', + environmentType: name === 'main' ? 'production' : 'development', openshiftProjectName: `${project.name}-${name}`.toLowerCase(), updated, created, @@ -287,7 +287,7 @@ mocks.Environment = (parent, args = {}, context, info) => { storageMonth: mocks.EnvironmentStorageMonth(), hitsMonth: mocks.EnvironmentHitsMonth(), envVariables: [ mocks.EnvKeyValue() ], - route: name === 'master' ? `https://${project.name}.org` : '', + route: name === 'main' ? `https://${project.name}.org` : '', routes: `https://${project.name}.org,https://varnish-${project.name}-org-prod.us.amazee.io,https://nginx-${project.name}-org-prod.us.amazee.io`, monitoringUrls: '', deployments: [], @@ -502,7 +502,7 @@ mocks.Query = () => ({ ? args.project : mocks.Project(null, {environments: []}); return [ - mocks.Environment(null, {project, name: 'master'}), + mocks.Environment(null, {project, name: 'main'}), mocks.Environment(null, {project, name: 'staging'}), mocks.Environment(null, {project, name: 'development'}), mocks.Environment(null, {project, name: 'pr-' + faker.random.number({min: 1, max: 50})}), diff --git a/services/api/src/resources/billing/billingCalculations.test.ts b/services/api/src/resources/billing/billingCalculations.test.ts index c2896f7e5a..df02d7a63c 100644 --- a/services/api/src/resources/billing/billingCalculations.test.ts +++ b/services/api/src/resources/billing/billingCalculations.test.ts @@ -931,7 +931,7 @@ describe('Billing Calculations #only-billing-calculations', () => { } }, { - name: 'master', + name: 'main', type: 'production', hits: { total: 0 diff --git a/services/api/src/resources/group/resolvers.test.ts b/services/api/src/resources/group/resolvers.test.ts index 64259777f4..c8a54adcd7 100644 --- a/services/api/src/resources/group/resolvers.test.ts +++ b/services/api/src/resources/group/resolvers.test.ts @@ -53,7 +53,7 @@ const defaultProject: Project = { name: 'PLACEHOLDER', gitUrl: 'http://github.com', openshift: 1, - productionEnvironment: 'master', + productionEnvironment: 'main', availability: 'STANDARD', }; @@ -531,7 +531,7 @@ describe('Billing Group Costs Related Queries & Mutation', () => { "environments": [ { "id": "3", - "name": "Master", + "name": "Main", "type": "production", "hits": { "total": 0 diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js index 1d8277e16c..29e5330b9e 100644 --- a/services/api/src/typeDefs.js +++ b/services/api/src/typeDefs.js @@ -442,7 +442,7 @@ const typeDefs = gql` Which branches should be deployed, can be one of: - \`true\` - all branches are deployed - \`false\` - no branches are deployed - - REGEX - regex of all branches that should be deployed, example: \`^(master|staging)$\` + - REGEX - regex of all branches that should be deployed, example: \`^(main|staging)$\` """ branches: String """ diff --git a/services/auth-server/README.md b/services/auth-server/README.md index b9596a091b..23eb6c3f6f 100644 --- a/services/auth-server/README.md +++ b/services/auth-server/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -44,4 +44,4 @@ Generates authentication tokens that are valid for other lagoon services. } ``` -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/logs2email/README.md b/services/logs2email/README.md index 4a5424132d..9e4cced6c2 100644 --- a/services/logs2email/README.md +++ b/services/logs2email/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -31,4 +31,4 @@ build for a Lagoon project environent has started, a task was completed. * Consumes: `lagoon-logs`, `lagoon-logs:email` * Produces: `lagoon-logs:email` -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/logs2microsoftteams/README.md b/services/logs2microsoftteams/README.md index 5b2c26a78b..2bdd0517c4 100644 --- a/services/logs2microsoftteams/README.md +++ b/services/logs2microsoftteams/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -14,7 +14,7 @@ Microsoft Teams message. Each log message is tied to a Lagoon project, and channel configuration for that project is retrieved from the Lagoon API. Examples of events that might trigger a message: GitHub pull request opened, a -new build for a Lagoon project environent has started, a task was completed. +new build for a Lagoon project environment has started, a task was completed. ## Technology @@ -31,4 +31,4 @@ new build for a Lagoon project environent has started, a task was completed. * Consumes: `lagoon-logs`, `lagoon-logs:microsoftTeams` * Produces: `lagoon-logs:microsoftTeams` -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/logs2rocketchat/README.md b/services/logs2rocketchat/README.md index 53a897984f..59358bccfa 100644 --- a/services/logs2rocketchat/README.md +++ b/services/logs2rocketchat/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -31,4 +31,4 @@ new build for a Lagoon project environent has started, a task was completed. * Consumes: `lagoon-logs`, `lagoon-logs:rocketchat` * Produces: `lagoon-logs:rocketchat` -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/logs2slack/README.md b/services/logs2slack/README.md index 82004717cd..c2c05e7a69 100644 --- a/services/logs2slack/README.md +++ b/services/logs2slack/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -31,4 +31,4 @@ new build for a Lagoon project environent has started, a task was completed. * Consumes: `lagoon-logs`, `lagoon-logs:slack` * Produces: `lagoon-logs:slack` -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/ssh/README.md b/services/ssh/README.md index 6cd46eb0b8..5d65bf7400 100644 --- a/services/ssh/README.md +++ b/services/ssh/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -29,4 +29,4 @@ workflows. * API [***dependency***] * auth-server [***dependency***] -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/ui/.storybook/lagoonTheme.js b/services/ui/.storybook/lagoonTheme.js index 5f7465b528..ad8f012900 100644 --- a/services/ui/.storybook/lagoonTheme.js +++ b/services/ui/.storybook/lagoonTheme.js @@ -4,6 +4,6 @@ import logo from './lagoon.png'; export default create({ base: 'light', brandTitle: 'Lagoon UI Style Guide', - // brandUrl: 'https://lagoon.readthedocs.io/en/latest/', - brandImage: logo, // 'https://lagoon.readthedocs.io/en/latest/images/lagoon-logo.png', + // brandUrl: 'https://docs.lagoon.sh/', + brandImage: logo, }); diff --git a/services/ui/src/components/ActiveStandbyConfirm/index.stories.js b/services/ui/src/components/ActiveStandbyConfirm/index.stories.js index 533f1424a8..df399c640e 100644 --- a/services/ui/src/components/ActiveStandbyConfirm/index.stories.js +++ b/services/ui/src/components/ActiveStandbyConfirm/index.stories.js @@ -22,8 +22,8 @@ export default { export const Default = ({ onProceedFunction, setInputValueFunction }) => ( ); diff --git a/services/ui/src/components/BillingGroup/data.json b/services/ui/src/components/BillingGroup/data.json index eaa2350e9b..2d3b98367f 100644 --- a/services/ui/src/components/BillingGroup/data.json +++ b/services/ui/src/components/BillingGroup/data.json @@ -346,7 +346,7 @@ }, { "id": "104036", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 186470 @@ -407,7 +407,7 @@ }, { "id": "106035", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 25720 diff --git a/services/ui/src/components/BillingGroupBarChart/data.json b/services/ui/src/components/BillingGroupBarChart/data.json index 84dfa7bac8..62fa350693 100644 --- a/services/ui/src/components/BillingGroupBarChart/data.json +++ b/services/ui/src/components/BillingGroupBarChart/data.json @@ -347,7 +347,7 @@ }, { "id": "104036", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 186470 @@ -408,7 +408,7 @@ }, { "id": "106035", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 25720 @@ -788,7 +788,7 @@ }, { "id": "104036", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 186470 @@ -849,7 +849,7 @@ }, { "id": "106035", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 25720 diff --git a/services/ui/src/components/BillingGroupProjects/data.json b/services/ui/src/components/BillingGroupProjects/data.json index eaa2350e9b..2d3b98367f 100644 --- a/services/ui/src/components/BillingGroupProjects/data.json +++ b/services/ui/src/components/BillingGroupProjects/data.json @@ -346,7 +346,7 @@ }, { "id": "104036", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 186470 @@ -407,7 +407,7 @@ }, { "id": "106035", - "name": "master", + "name": "main", "type": "production", "hits": { "total": 25720 diff --git a/services/ui/src/components/DeployLatest/index.stories.js b/services/ui/src/components/DeployLatest/index.stories.js index ed2742313c..a85be16042 100644 --- a/services/ui/src/components/DeployLatest/index.stories.js +++ b/services/ui/src/components/DeployLatest/index.stories.js @@ -8,7 +8,7 @@ export default { } seed(); -const environment = mocks.Environment(null, {name: 'master'}); +const environment = mocks.Environment(null, {name: 'main'}); export const Default = () => ( diff --git a/services/webhook-handler/README.md b/services/webhook-handler/README.md index cc8ce699e0..dc57b3cf70 100644 --- a/services/webhook-handler/README.md +++ b/services/webhook-handler/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -42,5 +42,5 @@ You can also run all tests from the CLI via newman yarn run newman:all -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ [Postman]: https://www.getpostman.com/ diff --git a/services/webhook-handler/newman/lagoon-webhook-handler.postman_collection.json b/services/webhook-handler/newman/lagoon-webhook-handler.postman_collection.json index ffffb01ce3..a47564e94c 100644 --- a/services/webhook-handler/newman/lagoon-webhook-handler.postman_collection.json +++ b/services/webhook-handler/newman/lagoon-webhook-handler.postman_collection.json @@ -357,7 +357,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"name\": \"high-cotton-master\",\n \"backup_metrics\": {\n \"backup_start_timestamp\": 0,\n \"backup_end_timestamp\": 0,\n \"errors\": 0,\n \"new_files\": 0,\n \"changed_files\": 0,\n \"unmodified_files\": 19,\n \"new_dirs\": 0,\n \"changed_dirs\": 1,\n \"unmodified_dirs\": 0,\n \"data_transferred\": 0,\n \"mounted_PVCs\": [\n \"nginx\",\n \"solr\"\n ]\n },\n \"snapshots\": [\n {\n \"id\": \"8ddac9900b18e8263455d744ca21af429a81f5309173a3c4986da12c02649852\",\n \"time\": \"2018-11-08T20:55:12.240921872Z\",\n \"tree\": \"c69327661323a0c597284dbb976f1d0b63a91f9acc617321f0f74e484327b07b\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"8353d86dd14e8e32009b02ec3b2ff74ae17812a2273fbd8e9e024cce4be3c682\",\n \"time\": \"2018-11-08T20:55:22.405136095Z\",\n \"tree\": \"2c2a1cc0ca1b6f4cdd2f51b5ce60d568ac03fbdcbcee3bb226dda3e96064fd09\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"c951362098638ef9459b40904bcc536de6afb68ef444fd02693f9fff7c62fdf3\",\n \"time\": \"2018-11-12T04:10:41.210628272Z\",\n \"tree\": \"8502f3ebc1dfb22c448947dd26722b69c3e2aaa9a7edcfecc518bf4b3c9df6c1\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"3bf5aac0603225a3181db5335de3b9b7965d99c7e869f751000498b8e22ba2aa\",\n \"time\": \"2018-11-12T04:10:44.546566325Z\",\n \"tree\": \"bc66eb3939bb60ed6c442cf99fcde7bf9a90364c520cc8a61f512ad12a10dc33\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"74373593ba0821c42551bd883531e84e9e0e4e624b61aecab2d9dc8d5ed286d5\",\n \"time\": \"2018-11-12T04:10:57.302416392Z\",\n \"tree\": \"b7108d9ffe1907ce9347978ad3460a1e0cd8761b7a93aabc99c915a8391911c0\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"abf2def9515320c86f1cfc726731cb0ce9abc6c8bde3accdbf46c8ebc2b69762\",\n \"time\": \"2018-11-12T04:12:12.968652711Z\",\n \"tree\": \"87d9e4c7f3f5cbff313988e704a6b8469fa61bba41dab73333c6fd58d30b6745\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"9a9f412e23db313ec1cac1773953d39d865e134f4e9e3332884bb87c35092b0b\",\n \"time\": \"2018-11-12T04:12:16.487622189Z\",\n \"tree\": \"3672d01c9a6d42ae3d37d7279264e3fbcab0093f4404bb60fbf5b3722ce16766\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"90cf5bf5ce930ede3587f6d352435b3d161c471fdef67015496b831072d1f2e1\",\n \"time\": \"2018-11-12T04:12:29.394725402Z\",\n \"tree\": \"aeecb64a023f75910139753f10f9e426c42aac55ed4e9adef26d931ad9c04cff\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"115bd2893671c3cf121c60f14c4900465a315ccc2a03720f8028cc49f75ec20b\",\n \"time\": \"2018-11-12T04:14:12.978278858Z\",\n \"tree\": \"2e355f0315bea8f7525dc8c387a7564b6204df93fde4cd981d6bbe8ab7d4ac3f\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"bfbe0ea503dad5970da16f0ebaeb4ff8aef5f6b1b69d9617cc4c95bf407389f2\",\n \"time\": \"2018-11-12T04:14:16.479753221Z\",\n \"tree\": \"db031c40d2cfa2d7958ab1b3789974f0e75d56a6ffc614a8c06c4f71a074502a\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"ff990cc387c7c14c70587efe73a5f8256bdb9f9a50e433eb01cf87446c135125\",\n \"time\": \"2018-11-12T04:14:28.863763589Z\",\n \"tree\": \"df71d603d6a4414ac86f22c13d21cd2a62dfbe2d2612d82ec143d1b98198a2a5\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"4a638e3738700193018f0668aa408b314d38879b742fa8f19000717e68b5dea0\",\n \"time\": \"2018-11-12T04:16:11.919985836Z\",\n \"tree\": \"c42e6b1a5be92e2c04d93f66e019900b87cad04da4a027b6125ab95e76bfb3c3\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"df743c6d78a0d36e23eea0d28f3a9fa6fa63ef4563b858bc3627147d573a4f10\",\n \"time\": \"2018-11-12T04:16:15.455637908Z\",\n \"tree\": \"350e74235a97434dc906f364993c26060353bad84fbd542b1d59ee4268862802\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"80b698920f97e36616f638cb59c379787967ff45416c9ba23c1807e4e0703414\",\n \"time\": \"2018-11-12T04:16:28.320904074Z\",\n \"tree\": \"e100116d5477c1746402649fde5219ae506a8d6605ed2600f6ada5dd340b5c23\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"96a675f8f8bb34d5fee530c1827e4a0220ced3e02a4ee72861d3f178c57d4a39\",\n \"time\": \"2018-11-12T04:18:13.912808872Z\",\n \"tree\": \"a163ecda8d6fc9e2ef26cfe0eeb5f8d8cc34c50138d8e35552ebd35bf67d2ab8\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"e890459c8636448f1c274df20d56d7887831968856ea7998ea6df0f4f90bc82f\",\n \"time\": \"2018-11-12T04:18:17.475944229Z\",\n \"tree\": \"81946d6d029bb33d11fd9898fce2710b9dd1754e7a5f576be3a0aa9799ee3c50\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"947e5421d5cfb8530aee8fa2d6abf09db67f63b306e227dddd951789ec52c3b9\",\n \"time\": \"2018-11-12T04:18:29.930604593Z\",\n \"tree\": \"0170e129c4d2a14b785ea52a90e89ac5bb4da79d94aae57b12f0fba754b91102\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"8c6eae0022de793ab0d26b0184300141ea551e872860df4168c7ebbcdfe63bca\",\n \"time\": \"2018-11-12T04:20:38.522899482Z\",\n \"tree\": \"724fc18b8273957c46ffc195c208703b1b56ad74a02f260aef559d8e27c93e8a\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"82133ad8fc4eefdca36b59cb1930cf84a462bfc311a6b90dec7d5f2884d0e387\",\n \"time\": \"2018-11-12T04:20:41.839459119Z\",\n \"tree\": \"53f36b66825c53b0b3894a823a6bde47ab473df999ad6a220e0e7e9f634ce46a\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"fbd0d2ac9e70c4fffd21aa3a4cfc3695e79d058c36aa4d7277da64d2fda6c54c\",\n \"time\": \"2018-11-12T04:20:54.078233202Z\",\n \"tree\": \"b3ea647b57cd9998ee187f05b104deb76719dd797fe455fae590f32bcc7a06df\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"32e01dc2871660fbfbc2bf00c4618d90350fdd66140f0c43f5b23b934b35b447\",\n \"time\": \"2018-11-12T04:22:12.35335149Z\",\n \"tree\": \"9a8bf18aa6451b65474b67c25b221e72c0f9ebe971428f263585ab3647740336\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"a624272f203ab3e42daea7e061d27dd9a85ec288f532834a4c9714c8c61bfc31\",\n \"time\": \"2018-11-12T04:22:16.000145366Z\",\n \"tree\": \"e43d9a7f5b34263e846611841305663e42c81402e2cf2b421fb282ba9e2ebe0f\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"37c0cfa208cdc7c1254d45d187294d90161ab0718615a9b1becd66c2e85ceec5\",\n \"time\": \"2018-11-12T04:22:30.23671284Z\",\n \"tree\": \"b272930e53830dbff9d2770ed6c80b1dd115ba60821cc501e0c0799668a7d2e8\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"f56ce6bc50998bed88702f45833ade4a4edce59536bb94e778a276791303e6db\",\n \"time\": \"2018-11-12T04:24:12.958144712Z\",\n \"tree\": \"19da8f40cb4393db1ec858ec65fb2eac45c38c76ff88e5f8f4bfec2bfd3f7852\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"3057caf7a7f8b51bf8588008d5a2eebe151809365ac1a3edffd4d6dc6414d404\",\n \"time\": \"2018-11-12T04:24:16.538215622Z\",\n \"tree\": \"97ca0c4bb778cb5f742c92b51b39fc4d177968944507d528b20d6c892e02cf69\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"f4bb1579222a8f33a806565aaf04990d65a39c02e680b1e80cf4f061db82a483\",\n \"time\": \"2018-11-12T04:24:28.870681932Z\",\n \"tree\": \"a4f7d06be74420cd55a071c363dd4e1cf6358b0067a288ba1543e07cb998c94c\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"428c59183687001c1bd98ffcaa82e24f586fe1faa70235b3567c5d26b7641769\",\n \"time\": \"2018-11-12T04:26:13.210768152Z\",\n \"tree\": \"63be205923e30f6a9faabca56a5bb026ed7bfa74b43932f53bb8b3614b9ae91e\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"42a9e209a7e4b73e323e1f2e9a93dab8bd7f0cf987b1dd448935b9c661718aec\",\n \"time\": \"2018-11-12T04:26:16.951077394Z\",\n \"tree\": \"894cf5cd02d0cedfc449998868f2e03a944a81f57995eaf15cddda0d7577e169\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"d3985dde21eb8507a361672f94c20bfc11760b6c2bd39f8dbe4d712dd3833939\",\n \"time\": \"2018-11-12T04:26:29.534973653Z\",\n \"tree\": \"79a63200d759209a6d844559183253143bd79bfaec980c596c42b98fb89fa460\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"efbe239ae0450975be1057c456808364f42066f500fc84573b952b0b24f09601\",\n \"time\": \"2018-11-12T04:28:13.768913899Z\",\n \"tree\": \"3e1e2e7e506b16d2219cc495dc49895b34f78f034550e8aec2011d84a6706436\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"ea829fab0d6b74f07dca0d2469bfe0ff3fcbc3fb8ae137880ad94e66d536dcbc\",\n \"time\": \"2018-11-12T04:28:17.671811992Z\",\n \"tree\": \"dc8b74eb02ea7a8d53a791a093e1974c89f5dacb96e913bc194766b800f7647a\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"30606c9d3e29371d237eaf85ff51d9e693812569cf2708629339284a21c61803\",\n \"time\": \"2018-11-12T04:28:29.788382743Z\",\n \"tree\": \"5a4e6fc33d5a10935db36163bb08558457be90407ec728f170bb45299274e803\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"95770d85946ecac3b17eb92a230fd1a4ff7832349c80888edd35073295b9e49d\",\n \"time\": \"2018-11-12T04:30:36.959765675Z\",\n \"tree\": \"8419ba476b2fc62159c40ecf3a755729274f3629b30e1935c3811499528e1be5\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"4e1b25eacbe9995d985a7bb708143d69a5d16e0a1bf258084637b5653b606488\",\n \"time\": \"2018-11-12T04:30:40.369368696Z\",\n \"tree\": \"c3e4389f875c3078c0dea25d8ba9cae459ff3760b2c4f3eafaab66fa4e42aa56\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"9ffae0808ad44c412c170a101eb209bbbdff4c793ca3c2892a5041f95a3a071c\",\n \"time\": \"2018-11-12T04:30:52.412839388Z\",\n \"tree\": \"336798912fdfc3ec88e28ea8f20b64d3970bea165c03d51018f87e4dd82e05db\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"33ce8ff15f8c223ba1f795af5115301055d51b9ecbc744e274d40f0551a0ec69\",\n \"time\": \"2018-11-12T04:32:12.640998654Z\",\n \"tree\": \"3cf30ebd3421b2a4367fecf822cd69ba76f33d8665ef5b32c0d4b37b4a96355d\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"f413f858ef817c5f99b837e0be6ce8bcdee799ccd3b08a90f752019e3c9a9674\",\n \"time\": \"2018-11-12T04:32:17.321911747Z\",\n \"tree\": \"2093c0222a98aaa38211717a66fb2d0549d257517d9743b378ec2e58f15ec484\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"ca6d06609501f1d289990d2092c9cbbff3795dc08f0b898aa1de7160ac0ac3eb\",\n \"time\": \"2018-11-12T04:32:29.84245698Z\",\n \"tree\": \"ca231e01303f25304339f00131f2ca373c52cc3f5e81ae54f613bf455817187e\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"3a9d8b5b574fcd1b8b4b4a13765f55d3b1da790bd62a0aea4c2c75c263abd6a9\",\n \"time\": \"2018-11-12T04:34:14.110205851Z\",\n \"tree\": \"543d9242a9956d260357b373a8cf9d2229541411893378cb70b36c67d2e49b81\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-master-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"2789ad33b90024a936a3852f351311151e75a002eaf5ac9c2918378e7383698c\",\n \"time\": \"2018-11-12T04:34:18.228960247Z\",\n \"tree\": \"5fc74fee5af40ce3e8efdc1cfc13f295ca367a5644860ca82c19e980bc36ca6f\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"15cfa0ce8ac6749a7d1af8783749562718a316f5c4a77ae6d60459ff3c2952fd\",\n \"time\": \"2018-11-12T04:34:31.033774542Z\",\n \"tree\": \"32265c58986f48f079b460c65a1e2dd421e970a1ff575b4071a89aa51e1ce151\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-master\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n }\n ]\n}" + "raw": "{\n \"name\": \"high-cotton-main\",\n \"backup_metrics\": {\n \"backup_start_timestamp\": 0,\n \"backup_end_timestamp\": 0,\n \"errors\": 0,\n \"new_files\": 0,\n \"changed_files\": 0,\n \"unmodified_files\": 19,\n \"new_dirs\": 0,\n \"changed_dirs\": 1,\n \"unmodified_dirs\": 0,\n \"data_transferred\": 0,\n \"mounted_PVCs\": [\n \"nginx\",\n \"solr\"\n ]\n },\n \"snapshots\": [\n {\n \"id\": \"8ddac9900b18e8263455d744ca21af429a81f5309173a3c4986da12c02649852\",\n \"time\": \"2018-11-08T20:55:12.240921872Z\",\n \"tree\": \"c69327661323a0c597284dbb976f1d0b63a91f9acc617321f0f74e484327b07b\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"8353d86dd14e8e32009b02ec3b2ff74ae17812a2273fbd8e9e024cce4be3c682\",\n \"time\": \"2018-11-08T20:55:22.405136095Z\",\n \"tree\": \"2c2a1cc0ca1b6f4cdd2f51b5ce60d568ac03fbdcbcee3bb226dda3e96064fd09\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"c951362098638ef9459b40904bcc536de6afb68ef444fd02693f9fff7c62fdf3\",\n \"time\": \"2018-11-12T04:10:41.210628272Z\",\n \"tree\": \"8502f3ebc1dfb22c448947dd26722b69c3e2aaa9a7edcfecc518bf4b3c9df6c1\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"3bf5aac0603225a3181db5335de3b9b7965d99c7e869f751000498b8e22ba2aa\",\n \"time\": \"2018-11-12T04:10:44.546566325Z\",\n \"tree\": \"bc66eb3939bb60ed6c442cf99fcde7bf9a90364c520cc8a61f512ad12a10dc33\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"74373593ba0821c42551bd883531e84e9e0e4e624b61aecab2d9dc8d5ed286d5\",\n \"time\": \"2018-11-12T04:10:57.302416392Z\",\n \"tree\": \"b7108d9ffe1907ce9347978ad3460a1e0cd8761b7a93aabc99c915a8391911c0\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"abf2def9515320c86f1cfc726731cb0ce9abc6c8bde3accdbf46c8ebc2b69762\",\n \"time\": \"2018-11-12T04:12:12.968652711Z\",\n \"tree\": \"87d9e4c7f3f5cbff313988e704a6b8469fa61bba41dab73333c6fd58d30b6745\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"9a9f412e23db313ec1cac1773953d39d865e134f4e9e3332884bb87c35092b0b\",\n \"time\": \"2018-11-12T04:12:16.487622189Z\",\n \"tree\": \"3672d01c9a6d42ae3d37d7279264e3fbcab0093f4404bb60fbf5b3722ce16766\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"90cf5bf5ce930ede3587f6d352435b3d161c471fdef67015496b831072d1f2e1\",\n \"time\": \"2018-11-12T04:12:29.394725402Z\",\n \"tree\": \"aeecb64a023f75910139753f10f9e426c42aac55ed4e9adef26d931ad9c04cff\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"115bd2893671c3cf121c60f14c4900465a315ccc2a03720f8028cc49f75ec20b\",\n \"time\": \"2018-11-12T04:14:12.978278858Z\",\n \"tree\": \"2e355f0315bea8f7525dc8c387a7564b6204df93fde4cd981d6bbe8ab7d4ac3f\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"bfbe0ea503dad5970da16f0ebaeb4ff8aef5f6b1b69d9617cc4c95bf407389f2\",\n \"time\": \"2018-11-12T04:14:16.479753221Z\",\n \"tree\": \"db031c40d2cfa2d7958ab1b3789974f0e75d56a6ffc614a8c06c4f71a074502a\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"ff990cc387c7c14c70587efe73a5f8256bdb9f9a50e433eb01cf87446c135125\",\n \"time\": \"2018-11-12T04:14:28.863763589Z\",\n \"tree\": \"df71d603d6a4414ac86f22c13d21cd2a62dfbe2d2612d82ec143d1b98198a2a5\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"4a638e3738700193018f0668aa408b314d38879b742fa8f19000717e68b5dea0\",\n \"time\": \"2018-11-12T04:16:11.919985836Z\",\n \"tree\": \"c42e6b1a5be92e2c04d93f66e019900b87cad04da4a027b6125ab95e76bfb3c3\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"df743c6d78a0d36e23eea0d28f3a9fa6fa63ef4563b858bc3627147d573a4f10\",\n \"time\": \"2018-11-12T04:16:15.455637908Z\",\n \"tree\": \"350e74235a97434dc906f364993c26060353bad84fbd542b1d59ee4268862802\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"80b698920f97e36616f638cb59c379787967ff45416c9ba23c1807e4e0703414\",\n \"time\": \"2018-11-12T04:16:28.320904074Z\",\n \"tree\": \"e100116d5477c1746402649fde5219ae506a8d6605ed2600f6ada5dd340b5c23\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"96a675f8f8bb34d5fee530c1827e4a0220ced3e02a4ee72861d3f178c57d4a39\",\n \"time\": \"2018-11-12T04:18:13.912808872Z\",\n \"tree\": \"a163ecda8d6fc9e2ef26cfe0eeb5f8d8cc34c50138d8e35552ebd35bf67d2ab8\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"e890459c8636448f1c274df20d56d7887831968856ea7998ea6df0f4f90bc82f\",\n \"time\": \"2018-11-12T04:18:17.475944229Z\",\n \"tree\": \"81946d6d029bb33d11fd9898fce2710b9dd1754e7a5f576be3a0aa9799ee3c50\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"947e5421d5cfb8530aee8fa2d6abf09db67f63b306e227dddd951789ec52c3b9\",\n \"time\": \"2018-11-12T04:18:29.930604593Z\",\n \"tree\": \"0170e129c4d2a14b785ea52a90e89ac5bb4da79d94aae57b12f0fba754b91102\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"8c6eae0022de793ab0d26b0184300141ea551e872860df4168c7ebbcdfe63bca\",\n \"time\": \"2018-11-12T04:20:38.522899482Z\",\n \"tree\": \"724fc18b8273957c46ffc195c208703b1b56ad74a02f260aef559d8e27c93e8a\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"82133ad8fc4eefdca36b59cb1930cf84a462bfc311a6b90dec7d5f2884d0e387\",\n \"time\": \"2018-11-12T04:20:41.839459119Z\",\n \"tree\": \"53f36b66825c53b0b3894a823a6bde47ab473df999ad6a220e0e7e9f634ce46a\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"fbd0d2ac9e70c4fffd21aa3a4cfc3695e79d058c36aa4d7277da64d2fda6c54c\",\n \"time\": \"2018-11-12T04:20:54.078233202Z\",\n \"tree\": \"b3ea647b57cd9998ee187f05b104deb76719dd797fe455fae590f32bcc7a06df\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"32e01dc2871660fbfbc2bf00c4618d90350fdd66140f0c43f5b23b934b35b447\",\n \"time\": \"2018-11-12T04:22:12.35335149Z\",\n \"tree\": \"9a8bf18aa6451b65474b67c25b221e72c0f9ebe971428f263585ab3647740336\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"a624272f203ab3e42daea7e061d27dd9a85ec288f532834a4c9714c8c61bfc31\",\n \"time\": \"2018-11-12T04:22:16.000145366Z\",\n \"tree\": \"e43d9a7f5b34263e846611841305663e42c81402e2cf2b421fb282ba9e2ebe0f\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"37c0cfa208cdc7c1254d45d187294d90161ab0718615a9b1becd66c2e85ceec5\",\n \"time\": \"2018-11-12T04:22:30.23671284Z\",\n \"tree\": \"b272930e53830dbff9d2770ed6c80b1dd115ba60821cc501e0c0799668a7d2e8\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"f56ce6bc50998bed88702f45833ade4a4edce59536bb94e778a276791303e6db\",\n \"time\": \"2018-11-12T04:24:12.958144712Z\",\n \"tree\": \"19da8f40cb4393db1ec858ec65fb2eac45c38c76ff88e5f8f4bfec2bfd3f7852\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"3057caf7a7f8b51bf8588008d5a2eebe151809365ac1a3edffd4d6dc6414d404\",\n \"time\": \"2018-11-12T04:24:16.538215622Z\",\n \"tree\": \"97ca0c4bb778cb5f742c92b51b39fc4d177968944507d528b20d6c892e02cf69\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"f4bb1579222a8f33a806565aaf04990d65a39c02e680b1e80cf4f061db82a483\",\n \"time\": \"2018-11-12T04:24:28.870681932Z\",\n \"tree\": \"a4f7d06be74420cd55a071c363dd4e1cf6358b0067a288ba1543e07cb998c94c\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"428c59183687001c1bd98ffcaa82e24f586fe1faa70235b3567c5d26b7641769\",\n \"time\": \"2018-11-12T04:26:13.210768152Z\",\n \"tree\": \"63be205923e30f6a9faabca56a5bb026ed7bfa74b43932f53bb8b3614b9ae91e\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"42a9e209a7e4b73e323e1f2e9a93dab8bd7f0cf987b1dd448935b9c661718aec\",\n \"time\": \"2018-11-12T04:26:16.951077394Z\",\n \"tree\": \"894cf5cd02d0cedfc449998868f2e03a944a81f57995eaf15cddda0d7577e169\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"d3985dde21eb8507a361672f94c20bfc11760b6c2bd39f8dbe4d712dd3833939\",\n \"time\": \"2018-11-12T04:26:29.534973653Z\",\n \"tree\": \"79a63200d759209a6d844559183253143bd79bfaec980c596c42b98fb89fa460\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"efbe239ae0450975be1057c456808364f42066f500fc84573b952b0b24f09601\",\n \"time\": \"2018-11-12T04:28:13.768913899Z\",\n \"tree\": \"3e1e2e7e506b16d2219cc495dc49895b34f78f034550e8aec2011d84a6706436\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"ea829fab0d6b74f07dca0d2469bfe0ff3fcbc3fb8ae137880ad94e66d536dcbc\",\n \"time\": \"2018-11-12T04:28:17.671811992Z\",\n \"tree\": \"dc8b74eb02ea7a8d53a791a093e1974c89f5dacb96e913bc194766b800f7647a\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"30606c9d3e29371d237eaf85ff51d9e693812569cf2708629339284a21c61803\",\n \"time\": \"2018-11-12T04:28:29.788382743Z\",\n \"tree\": \"5a4e6fc33d5a10935db36163bb08558457be90407ec728f170bb45299274e803\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"95770d85946ecac3b17eb92a230fd1a4ff7832349c80888edd35073295b9e49d\",\n \"time\": \"2018-11-12T04:30:36.959765675Z\",\n \"tree\": \"8419ba476b2fc62159c40ecf3a755729274f3629b30e1935c3811499528e1be5\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"4e1b25eacbe9995d985a7bb708143d69a5d16e0a1bf258084637b5653b606488\",\n \"time\": \"2018-11-12T04:30:40.369368696Z\",\n \"tree\": \"c3e4389f875c3078c0dea25d8ba9cae459ff3760b2c4f3eafaab66fa4e42aa56\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"9ffae0808ad44c412c170a101eb209bbbdff4c793ca3c2892a5041f95a3a071c\",\n \"time\": \"2018-11-12T04:30:52.412839388Z\",\n \"tree\": \"336798912fdfc3ec88e28ea8f20b64d3970bea165c03d51018f87e4dd82e05db\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"33ce8ff15f8c223ba1f795af5115301055d51b9ecbc744e274d40f0551a0ec69\",\n \"time\": \"2018-11-12T04:32:12.640998654Z\",\n \"tree\": \"3cf30ebd3421b2a4367fecf822cd69ba76f33d8665ef5b32c0d4b37b4a96355d\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"f413f858ef817c5f99b837e0be6ce8bcdee799ccd3b08a90f752019e3c9a9674\",\n \"time\": \"2018-11-12T04:32:17.321911747Z\",\n \"tree\": \"2093c0222a98aaa38211717a66fb2d0549d257517d9743b378ec2e58f15ec484\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"ca6d06609501f1d289990d2092c9cbbff3795dc08f0b898aa1de7160ac0ac3eb\",\n \"time\": \"2018-11-12T04:32:29.84245698Z\",\n \"tree\": \"ca231e01303f25304339f00131f2ca373c52cc3f5e81ae54f613bf455817187e\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"3a9d8b5b574fcd1b8b4b4a13765f55d3b1da790bd62a0aea4c2c75c263abd6a9\",\n \"time\": \"2018-11-12T04:34:14.110205851Z\",\n \"tree\": \"543d9242a9956d260357b373a8cf9d2229541411893378cb70b36c67d2e49b81\",\n \"paths\": [\n \"/go/src/git.vshn.net/vshn/wrestic/stdin\"\n ],\n \"hostname\": \"high-cotton-main-cli\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"2789ad33b90024a936a3852f351311151e75a002eaf5ac9c2918378e7383698c\",\n \"time\": \"2018-11-12T04:34:18.228960247Z\",\n \"tree\": \"5fc74fee5af40ce3e8efdc1cfc13f295ca367a5644860ca82c19e980bc36ca6f\",\n \"paths\": [\n \"/data/nginx\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n },\n {\n \"id\": \"15cfa0ce8ac6749a7d1af8783749562718a316f5c4a77ae6d60459ff3c2952fd\",\n \"time\": \"2018-11-12T04:34:31.033774542Z\",\n \"tree\": \"32265c58986f48f079b460c65a1e2dd421e970a1ff575b4071a89aa51e1ce151\",\n \"paths\": [\n \"/data/solr\"\n ],\n \"hostname\": \"high-cotton-main\",\n \"username\": \"\",\n \"uid\": 0,\n \"gid\": 0,\n \"tags\": null\n }\n ]\n}" }, "url": { "raw": "{{hostname}}", diff --git a/services/webhooks2tasks/README.md b/services/webhooks2tasks/README.md index 80565a3942..e6ae73d9b1 100644 --- a/services/webhooks2tasks/README.md +++ b/services/webhooks2tasks/README.md @@ -1,5 +1,5 @@

The Lagoon logo is a blue hexagon split in two pieces with an L-shaped cut

@@ -31,4 +31,4 @@ Examples of tasks: trigger a new build, record a new backup. * Consumes: `lagoon-webhooks`, `lagoon-webhooks:queue` * Produces: `lagoon-webhooks-delay` -[documentation]: https://lagoon.readthedocs.io/ +[documentation]: https://docs.lagoon.sh/ diff --git a/services/webhooks2tasks/src/handlers/gitlabProjectCreate.ts b/services/webhooks2tasks/src/handlers/gitlabProjectCreate.ts index 26349bf7cc..85f3b08b16 100644 --- a/services/webhooks2tasks/src/handlers/gitlabProjectCreate.ts +++ b/services/webhooks2tasks/src/handlers/gitlabProjectCreate.ts @@ -16,8 +16,8 @@ export async function gitlabProjectCreate(webhook: WebhookRequestData) { // TODO: figure out openshift id const openshift = 1; - // set production environment to default master - const productionenvironment = "master"; + // set production environment to default main + const productionenvironment = "main"; const meta = { data: project, diff --git a/services/webhooks2tasks/src/handlers/gitlabProjectUpdate.ts b/services/webhooks2tasks/src/handlers/gitlabProjectUpdate.ts index 17ae693c59..99b984243f 100644 --- a/services/webhooks2tasks/src/handlers/gitlabProjectUpdate.ts +++ b/services/webhooks2tasks/src/handlers/gitlabProjectUpdate.ts @@ -123,8 +123,8 @@ export async function gitlabProjectUpdate(webhook: WebhookRequestData) { // TODO: figure out openshift id const openshift = 1; - // set production environment to default master - const productionenvironment = "master"; + // set production environment to default main + const productionenvironment = "main"; // Project was transferred from a non-group namespace to a group namespace, we add a new project await addProject(projectName, gitUrl, openshift, productionenvironment); diff --git a/services/webhooks2tasks/src/handlers/resticbackupSnapshotFinished.ts b/services/webhooks2tasks/src/handlers/resticbackupSnapshotFinished.ts index 728e4d7860..310f5ea67e 100644 --- a/services/webhooks2tasks/src/handlers/resticbackupSnapshotFinished.ts +++ b/services/webhooks2tasks/src/handlers/resticbackupSnapshotFinished.ts @@ -103,10 +103,10 @@ export async function resticbackupSnapshotFinished(webhook: WebhookRequestData) // called `bar`). This logic is made slightly more complex by the fact that // there was a bug in the k8up system that produced filenames like // - // * drupal-example-site-master-solr-prebackuppod.solr.tar - // * drupal-example-site-master-solr-prebackuppod - // * drupal-example-site-master-mariadb-prebackuppod - // * drupal-example-site-master-mariadb-prebackuppod.mariadb.sql + // * drupal-example-site-main-solr-prebackuppod.solr.tar + // * drupal-example-site-main-solr-prebackuppod + // * drupal-example-site-main-mariadb-prebackuppod + // * drupal-example-site-main-mariadb-prebackuppod.mariadb.sql // // So we need to cater for these additional filenames. let source;