Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Monitoring resources #333

Merged
merged 65 commits into from
Jun 29, 2020
Merged

Monitoring resources #333

merged 65 commits into from
Jun 29, 2020

Conversation

eguzki
Copy link
Member

@eguzki eguzki commented Mar 2, 2020 •
edited
Loading

Deploy monitoring resources.

Features:

  • New APIManager CRD attribute to enable / disable
  • Reconcilliate ServiceMonitors for metric enabled components
  • Reconcilliate GrafanaDashboards
  • Reconcilliate PrometheusRules

Others:

  • Embedding static files, i.e. resources, in Go using https://github.com/go-bindata/go-bindata
    • Grafana dashboards are large json files and it is very convenient to work embedding files in the binary.
  • Templates with import "text/template"

Questions open:

  • Implementation for templates? -> NO
  • If servicemonitors/grafana/prometheusrules CRD's are not installed in the cluster, currently log and continue. Other operators implement periodical checking and install resources when CRD's are available.

Missing:

  • Tests
  • components using options
  • Adapt SaaS grafana dashboard spec for components in on prem deployment.
  • Adapt SaaS prometheus rules spec for components in on prem deployment.
  • Upgrading step from previous releases
  • upstream doc

@eguzki eguzki force-pushed the monitoring-tools branch from b1140df to 2903fe2 Compare March 4, 2020 11:15
@eguzki eguzki self-assigned this Mar 4, 2020
@eguzki eguzki force-pushed the monitoring-tools branch 6 times, most recently from 4933fec to e2e05a7 Compare March 10, 2020 17:43
@eguzki eguzki requested a review from miguelsorianod March 11, 2020 14:36
@eguzki eguzki force-pushed the monitoring-tools branch from 7b71ced to 14d005a Compare March 18, 2020 11:59
@eguzki eguzki force-pushed the monitoring-tools branch 2 times, most recently from 91a5ce0 to d8008a9 Compare April 1, 2020 17:54
@eguzki eguzki force-pushed the monitoring-tools branch from 02e5d94 to 8fd0338 Compare April 21, 2020 16:35
@eguzki eguzki force-pushed the monitoring-tools branch from 8fd0338 to 52f7a21 Compare May 11, 2020 13:12
@eguzki eguzki force-pushed the monitoring-tools branch 3 times, most recently from 7a9f831 to 3c88a7f Compare May 22, 2020 12:28
@eguzki eguzki force-pushed the monitoring-tools branch 2 times, most recently from 3a1430d to 6614d27 Compare June 9, 2020 13:15
@eguzki eguzki changed the title [WIP] Monitoring tools Monitoring tools Jun 22, 2020
@eguzki
Copy link
Member Author

eguzki commented Jun 22, 2020 •
edited
Loading

There are small changes coming, but overall, the PR is ready to be merged.

Review @miguelsorianod

@eguzki eguzki removed their assignment Jun 22, 2020
eguzki and others added 20 commits June 26, 2020 18:03
@eguzki
monitoring: apicasts rules
cf93808
@roivaz @eguzki
Apply fixes for apicast and apicast services dashboard
b474aad
@eguzki
fix monitoring doc
aab506a
@eguzki
fix duplicated import
53f3456
@eguzki
remove todo comments
33b3dcc
@eguzki
fix assets comment
0ec722d
@eguzki
generate assets
99d4d5c
@eguzki
apicast prometheus alert only on production gateway
767b8e0
@eguzki
regenerate k8s resources
6f3ff88
@eguzki
Makefile: assets target has install-tools as dep
45c8a72
@eguzki
adapt backup and restore controller to the new base reconciler
41ce638
@slopezz @eguzki
Fix pod promql queries on apicast grafana dashboard
f475592
@slopezz @eguzki
Update backend grafana dashboard with latest SaaS dashboard version
76658fc
@slopezz @eguzki
Update assets after updating dashboards
e1f53d6
@eguzki
monitoring changes for operator only
1a5a82f
@eguzki
template generation
4c3bbb9
@eguzki
monitoring: upgrade path
bbbd132
@eguzki
fix unittests for new metrics options
ef240b5
@eguzki
monitoring resources enabled for operator, disabled for templates
84a4af8
@eguzki
fix unittests after rebase
775a0a6
@eguzki eguzki force-pushed the monitoring-tools branch from 8ff6823 to 775a0a6 Compare June 26, 2020 16:07
miguelsorianod
miguelsorianod suggested changes Jun 29, 2020
View reviewed changes
Copy link
Contributor

@miguelsorianod miguelsorianod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

Left some minor feedback

@eguzki eguzki force-pushed the monitoring-tools branch from 280b852 to c7ef61b Compare June 29, 2020 12:23
@codeclimate
Copy link

codeclimate bot commented Jun 29, 2020

Code Climate has analyzed commit c7ef61b and detected 96 issues on this pull request.

Here's the issue category breakdown:

Category Count
Complexity 9
Duplication 44
Style 43

View more on Code Climate.

@eguzki eguzki merged commit c060912 into master Jun 29, 2020
@eguzki eguzki deleted the monitoring-tools branch June 29, 2020 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miguelsorianod miguelsorianod miguelsorianod approved these changes

Assignees

@miguelsorianod miguelsorianod

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eguzki @miguelsorianod @slopezz @roivaz