Send GitLab host logs to CloudWatch (#3894) #5187

achave11-ucsc · 2023-05-05T22:52:33Z

Connected issues: #3894

Checklist

Author

PR is a draft
Target branch is develop
Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
PR title references all connected issues
PR title matches¹ that of a connected issue _{or comment in PR explains why they're different}
For each connected issue, there is at least one commit whose title references that issue
PR is connected to all connected issues via ZenHub
PR description links to connected issues
Added partial label to PR _{or this PR completely resolves all connected issues}

¹ when the issue title describes a problem, the corresponding PR
title is Fix: followed by the issue title

Author (reindex, API changes)

Added r tag to commit title _{or this PR does not require reindexing}
Added reindex label to PR _{or this PR does not require reindexing}
Added a (compatible changes) or A (incompatible ones) tag to commit title _{or this PR does not modify the Azul service API}
Added API label to connected issues _{or this PR does not modify the Azul service API}

Author (chains)

This PR is blocked by previous PR in the chain _{or this PR is not chained to another PR}
Added base label to the blocking PR _{or this PR is not chained to another PR}
Added chained label to this PR _{or this PR is not chained to another PR}

Author (upgrading)

Documented upgrading of deployments in UPGRADING.rst _{or this PR does not require upgrading}
Added u tag to commit title _{or this PR does not require upgrading}
Added upgrade label to PR _{or this PR does not require upgrading}

Author (operator tasks)

Added checklist items for additional operator tasks _{or this PR does not require additional tasks}

Author (hotfixes)

Added F tag to main commit title _{or this PR does not include permanent fix for a temporary hotfix}
Reverted the temporary hotfixes for any connected issues _{or the prod branch has no temporary hotfixes for any connected issues}

Author (before every review)

Rebased PR branch on develop, squashed old fixups
Ran make requirements_update _{or this PR does not touch requirements*.txt, common.mk, Makefile and Dockerfile}
Added R tag to commit title _{or this PR does not touch requirements*.txt}
Added reqs label to PR _{or this PR does not touch requirements*.txt}
make integration_test passes in personal deployment _{or this PR does not touch functionality that could break the IT}

Peer reviewer (after requesting changes)

Uncheck the Author (before every review) checklists.

Peer reviewer (after approval)

PR is not a draft
Ticket is in Review requested column
Requested review from primary reviewer
Assigned PR to primary reviewer

Primary reviewer (after requesting changes)

Uncheck the before every review checklists. Update the N reviews label.

Primary reviewer (after approval)

Actually approved the PR
Labeled connected issues as demo or no demo
Commented on connected issues about demo expectations _{or all connected issues are labeled no demo}
Decided if PR can be labeled no sandbox
PR title is appropriate as title of merge commit
N reviews label is accurate
Moved ticket to Approved column
Assigned PR to current operator

Operator (before pushing merge the commit)

Operator (after pushing the merge commit)

¹ When pushing the merge commit is skipped due to the PR being
labelled no sandbox, the next build triggered by a PR whose merge commit is
pushed determines this checklist item.

Operator (reindex)

Deleted unreferenced indices in dev _{or this PR does not remove catalogs or otherwise causes unreferenced indices}
Deleted unreferenced indices in anvildev _{or this PR does not remove catalogs or otherwise causes unreferenced indices}
Started reindex in dev _{or this PR does not require reindexing}
Started reindex in anvildev _{or this PR does not require reindexing}
Checked for and triaged indexing failures in dev _{or this PR does not require reindexing}
Checked for and triaged indexing failures in anvildev _{or this PR does not require reindexing}
Emptied fail queues in dev deployment _{or this PR does not require reindexing}
Emptied fail queues in anvildev deployment _{or this PR does not require reindexing}

Operator

Add checklist item to promotion PR 'Deployed the prod.gitlab component'
Unassigned PR

Shorthand for review comments

L line is too long
W line wrapping is wrong
Q bad quotes
F other formatting problem

terraform/gitlab/gitlab.tf.json.template.py

coveralls · 2023-05-08T16:09:37Z

Coverage: 84.435%. Remained the same when pulling 89fdaf4 on issues/achave11-ucsc/3894-forward-GL-logs-iCW into 7bbfd89 on develop.

codecov · 2023-05-08T16:13:29Z

Codecov Report

Merging #5187 (89fdaf4) into develop (7bbfd89) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #5187   +/-   ##
========================================
  Coverage    84.41%   84.41%           
========================================
  Files          149      149           
  Lines        18305    18305           
========================================
  Hits         15452    15452           
  Misses        2853     2853

nadove-ucsc · 2023-05-09T02:24:20Z

terraform/gitlab/gitlab.tf.json.template.py

+                                                    } for path in ['gitaly/gitaly_ruby_json.log',
+                                                                   'gitlab-shell/gitlab-shell.log',
+                                                                   'nginx/gitlab_access.log',
+                                                                   'nginx/gitlab_error.log',
+                                                                   'nginx/gitlab_registry_access.log',
+                                                                   'puma/puma_stderr.log',
+                                                                   'puma/puma_stdout.log']


Suggested change

} for path in ['gitaly/gitaly_ruby_json.log',

'gitlab-shell/gitlab-shell.log',

'nginx/gitlab_access.log',

'nginx/gitlab_error.log',

'nginx/gitlab_registry_access.log',

'puma/puma_stderr.log',

'puma/puma_stdout.log']

} for path in [

'gitaly/gitaly_ruby_json.log',

'gitlab-shell/gitlab-shell.log',

'nginx/gitlab_access.log',

'nginx/gitlab_error.log',

'nginx/gitlab_registry_access.log',

'puma/puma_stderr.log',

'puma/puma_stdout.log'

]

Also consider removing the .log extension from these entries and moving it to the f-strings above, e.g. "file_path": f'/mnt/gitlab/logs/{path}.log',

nadove-ucsc · 2023-05-09T02:27:21Z

terraform/gitlab/gitlab.tf.json.template.py

+                                                        "file_path": f'/mnt/gitlab/logs/gitlab-rails/{path}',
+                                                        "log_group_name": "/aws/cwagent/azul-gitlab",
+                                                        "log_stream_name": f'/mnt/gitlab/logs/gitlab-rails/{path}'
+                                                    } for path in ['api_json.log',


Same comments as above

terraform/gitlab/gitlab.tf.json.template.py

nadove-ucsc · 2023-05-09T02:28:11Z

terraform/gitlab/gitlab.tf.json.template.py

+                                                                   'cron',
+                                                                   'maillog',
+                                                                   'messages',
+                                                                   'secure']


Same wrapping issue as above

terraform/gitlab/gitlab.tf.json.template.py

nadove-ucsc

I can't find precedent for your solution in the codebase or the contributing guide, but I also can't come up with anything better since my previous suggestions didn't work. We should still be consistent though and there's one place where the line breaks are still inconsistent.

nadove-ucsc · 2023-05-11T03:37:05Z

terraform/gitlab/gitlab.tf.json.template.py

+                                                        "file_path": f'/mnt/gitlab/logs/{path}.log',
+                                                        "log_group_name": "/aws/cwagent/azul-gitlab",
+                                                        "log_stream_name": f'/mnt/gitlab/logs/{path}.log'
+                                                    } for path in


For consistency with the other sections

Suggested change

} for path in

}

for path in

terraform/gitlab/gitlab.tf.json.template.py

hannes-ucsc · 2023-05-25T17:56:10Z

terraform/gitlab/gitlab.tf.json.template.py

+                            '-a', 'fetch-config',
+                            '-m', 'ec2',
+                            '-s',
+                            '-c', 'file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json'


If these options have long versions (--foo) then we should use them here. Any options that aren't self-explanatory—and short ones (-x) usually aren't—should be explained in a short comment.

achave11-ucsc · 2023-05-26T19:12:55Z

@hannes-ucsc: "The de-bump review count because one of my comments was invalid."

terraform/gitlab/gitlab.tf.json.template.py

github-actions bot added the orange [process] Done by the Azul team label May 5, 2023

github-advanced-security bot found potential problems May 5, 2023

View reviewed changes

terraform/gitlab/gitlab.tf.json.template.py Fixed Show resolved Hide resolved

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch from b1dcea5 to c9f9d78 Compare May 8, 2023 15:49

achave11-ucsc added the upgrade [process] PR includes commit requiring manual upgrade label May 8, 2023

achave11-ucsc assigned nadove-ucsc May 9, 2023

achave11-ucsc requested a review from nadove-ucsc May 9, 2023 01:04

nadove-ucsc requested changes May 9, 2023

View reviewed changes

nadove-ucsc removed their assignment May 9, 2023

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch 3 times, most recently from a1e706a to 5cb1176 Compare May 9, 2023 17:19

This was referenced May 9, 2023

PyCharm formatter hangs on Apple Silicon #5193

Closed

Results of make format run cause conflincts with make pep8 command #5195

Closed

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch 3 times, most recently from e98ca13 to 40f1b05 Compare May 10, 2023 23:00

achave11-ucsc commented May 11, 2023

View reviewed changes

terraform/gitlab/gitlab.tf.json.template.py Outdated Show resolved Hide resolved

achave11-ucsc requested a review from nadove-ucsc May 11, 2023 03:15

achave11-ucsc assigned nadove-ucsc May 11, 2023

nadove-ucsc requested changes May 11, 2023

View reviewed changes

nadove-ucsc removed their assignment May 11, 2023

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch from c043736 to f60fcdc Compare May 11, 2023 18:15

achave11-ucsc commented May 11, 2023

View reviewed changes

terraform/gitlab/gitlab.tf.json.template.py Outdated Show resolved Hide resolved

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch 2 times, most recently from 0d10bdf to 56f48e8 Compare May 11, 2023 21:58

achave11-ucsc requested a review from nadove-ucsc May 11, 2023 22:24

achave11-ucsc assigned nadove-ucsc May 11, 2023

nadove-ucsc approved these changes May 11, 2023

View reviewed changes

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch 2 times, most recently from 134180c to 051811d Compare May 24, 2023 21:28

achave11-ucsc requested a review from hannes-ucsc May 25, 2023 17:35

achave11-ucsc assigned hannes-ucsc May 25, 2023

hannes-ucsc requested changes May 25, 2023

View reviewed changes

hannes-ucsc added 3 reviews [process] Lead requested changes thrice and removed 2 reviews [process] Lead requested changes twice labels May 25, 2023

hannes-ucsc removed their assignment May 25, 2023

achave11-ucsc added 2 reviews [process] Lead requested changes twice and removed 3 reviews [process] Lead requested changes thrice labels May 26, 2023

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch from 051811d to 65d3afb Compare May 26, 2023 23:06

github-advanced-security bot found potential problems May 26, 2023

View reviewed changes

terraform/gitlab/gitlab.tf.json.template.py Fixed Show fixed Hide fixed

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch 2 times, most recently from 29151a4 to c29c8c3 Compare May 26, 2023 23:31

achave11-ucsc requested a review from hannes-ucsc May 27, 2023 00:34

achave11-ucsc assigned hannes-ucsc May 27, 2023

hannes-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch from c29c8c3 to 6bedce5 Compare May 27, 2023 05:06

hannes-ucsc approved these changes May 27, 2023

View reviewed changes

hannes-ucsc assigned achave11-ucsc and unassigned hannes-ucsc May 27, 2023

[u] Send GitLab host logs to CloudWatch (#3894)

89fdaf4

achave11-ucsc force-pushed the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch from 6bedce5 to 89fdaf4 Compare May 30, 2023 22:36

achave11-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label May 30, 2023

achave11-ucsc merged commit 0357f29 into develop May 30, 2023

achave11-ucsc deleted the issues/achave11-ucsc/3894-forward-GL-logs-iCW branch May 31, 2023 03:43

dsotirho-ucsc assigned dsotirho-ucsc and unassigned achave11-ucsc and dsotirho-ucsc Jun 5, 2023

dsotirho-ucsc mentioned this pull request Sep 20, 2023

Review audit log retention #5078

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Send GitLab host logs to CloudWatch (#3894) #5187

Send GitLab host logs to CloudWatch (#3894) #5187

achave11-ucsc commented May 5, 2023 •

edited by dsotirho-ucsc

Loading

coveralls commented May 8, 2023 •

edited

Loading

codecov bot commented May 8, 2023 •

edited

Loading

nadove-ucsc May 9, 2023

nadove-ucsc May 9, 2023

nadove-ucsc May 9, 2023

nadove-ucsc May 9, 2023

nadove-ucsc left a comment

nadove-ucsc May 11, 2023

hannes-ucsc May 25, 2023

achave11-ucsc commented May 26, 2023

Send GitLab host logs to CloudWatch (#3894) #5187

Send GitLab host logs to CloudWatch (#3894) #5187

Conversation

achave11-ucsc commented May 5, 2023 • edited by dsotirho-ucsc Loading

Checklist

Author

Author (reindex, API changes)

Author (chains)

Author (upgrading)

Author (operator tasks)

Author (hotfixes)

Author (before every review)

Peer reviewer (after requesting changes)

Peer reviewer (after approval)

Primary reviewer (after requesting changes)

Primary reviewer (after approval)

Operator (before pushing merge the commit)

Operator (after pushing the merge commit)

Operator (reindex)

Operator

Shorthand for review comments

coveralls commented May 8, 2023 • edited Loading

codecov bot commented May 8, 2023 • edited Loading

Codecov Report

nadove-ucsc May 9, 2023

Choose a reason for hiding this comment

nadove-ucsc May 9, 2023

Choose a reason for hiding this comment

nadove-ucsc May 9, 2023

Choose a reason for hiding this comment

nadove-ucsc May 9, 2023

Choose a reason for hiding this comment

nadove-ucsc left a comment

Choose a reason for hiding this comment

nadove-ucsc May 11, 2023

Choose a reason for hiding this comment

hannes-ucsc May 25, 2023

Choose a reason for hiding this comment

achave11-ucsc commented May 26, 2023

achave11-ucsc commented May 5, 2023 •

edited by dsotirho-ucsc

Loading

coveralls commented May 8, 2023 •

edited

Loading

codecov bot commented May 8, 2023 •

edited

Loading