From b77fe7db3e885edca14c862f362e2bbd43f0e498 Mon Sep 17 00:00:00 2001 From: Chris Baumbauer Date: Sat, 6 Apr 2019 02:02:39 +0000 Subject: Add Knative metrics to Prometheus --- .../javascripts/serverless/components/area.vue | 146 +++++++++++++++++++++ .../serverless/components/function_details.vue | 54 +++++++- .../serverless/components/function_row.vue | 5 + .../serverless/components/functions.vue | 44 ++++--- .../serverless/components/missing_prometheus.vue | 63 +++++++++ app/assets/javascripts/serverless/constants.js | 3 + .../javascripts/serverless/serverless_bundle.js | 125 ++++-------------- .../serverless/services/get_functions_service.js | 11 -- app/assets/javascripts/serverless/store/actions.js | 113 ++++++++++++++++ app/assets/javascripts/serverless/store/getters.js | 10 ++ app/assets/javascripts/serverless/store/index.js | 18 +++ .../javascripts/serverless/store/mutation_types.js | 9 ++ .../javascripts/serverless/store/mutations.js | 38 ++++++ app/assets/javascripts/serverless/store/state.js | 13 ++ .../serverless/stores/serverless_details_store.js | 11 -- .../serverless/stores/serverless_store.js | 29 ---- app/assets/javascripts/serverless/utils.js | 23 ++++ .../projects/serverless/functions_controller.rb | 23 +++- .../projects/serverless/functions_finder.rb | 28 +++- app/models/serverless/function.rb | 26 ++++ .../projects/serverless/service_entity.rb | 7 + .../projects/serverless/functions/index.html.haml | 5 +- .../projects/serverless/functions/show.html.haml | 11 +- changelogs/unreleased/knative-prometheus.yml | 5 + config/prometheus/common_metrics.yml | 10 ++ config/routes/project.rb | 6 +- ...20190326164045_import_common_metrics_knative.rb | 17 +++ db/schema.rb | 2 +- .../serverless/img/function-details-loaded.png | Bin 0 -> 93515 bytes doc/user/project/clusters/serverless/index.md | 20 +++ .../prometheus/queries/knative_invocation_query.rb | 39 ++++++ locale/gitlab.pot | 18 ++- .../serverless/functions_controller_spec.rb | 9 ++ .../features/projects/serverless/functions_spec.rb | 2 +- .../projects/serverless/functions_finder_spec.rb | 32 ++++- .../javascripts/serverless/components/area_spec.js | 121 +++++++++++++++++ .../serverless/components/environment_row_spec.js | 41 +++--- .../serverless/components/function_details_spec.js | 113 ++++++++++++++++ .../serverless/components/function_row_spec.js | 13 +- .../serverless/components/functions_spec.js | 113 ++++++++++------ .../components/missing_prometheus_spec.js | 37 ++++++ .../serverless/components/pod_box_spec.js | 22 ++++ spec/javascripts/serverless/components/url_spec.js | 20 ++- spec/javascripts/serverless/mock_data.js | 57 ++++++++ spec/javascripts/serverless/store/actions_spec.js | 88 +++++++++++++ spec/javascripts/serverless/store/getters_spec.js | 43 ++++++ .../javascripts/serverless/store/mutations_spec.js | 86 ++++++++++++ .../serverless/stores/serverless_store_spec.js | 36 ----- spec/javascripts/serverless/utils.js | 20 +++ .../queries/knative_invocation_query_spec.rb | 26 ++++ spec/models/serverless/function_spec.rb | 21 +++ spec/support/helpers/prometheus_helpers.rb | 4 + 52 files changed, 1516 insertions(+), 320 deletions(-) create mode 100644 app/assets/javascripts/serverless/components/area.vue create mode 100644 app/assets/javascripts/serverless/components/missing_prometheus.vue create mode 100644 app/assets/javascripts/serverless/constants.js delete mode 100644 app/assets/javascripts/serverless/services/get_functions_service.js create mode 100644 app/assets/javascripts/serverless/store/actions.js create mode 100644 app/assets/javascripts/serverless/store/getters.js create mode 100644 app/assets/javascripts/serverless/store/index.js create mode 100644 app/assets/javascripts/serverless/store/mutation_types.js create mode 100644 app/assets/javascripts/serverless/store/mutations.js create mode 100644 app/assets/javascripts/serverless/store/state.js delete mode 100644 app/assets/javascripts/serverless/stores/serverless_details_store.js delete mode 100644 app/assets/javascripts/serverless/stores/serverless_store.js create mode 100644 app/assets/javascripts/serverless/utils.js create mode 100644 app/models/serverless/function.rb create mode 100644 changelogs/unreleased/knative-prometheus.yml create mode 100644 db/migrate/20190326164045_import_common_metrics_knative.rb create mode 100644 doc/user/project/clusters/serverless/img/function-details-loaded.png create mode 100644 lib/gitlab/prometheus/queries/knative_invocation_query.rb create mode 100644 spec/javascripts/serverless/components/area_spec.js create mode 100644 spec/javascripts/serverless/components/function_details_spec.js create mode 100644 spec/javascripts/serverless/components/missing_prometheus_spec.js create mode 100644 spec/javascripts/serverless/components/pod_box_spec.js create mode 100644 spec/javascripts/serverless/store/actions_spec.js create mode 100644 spec/javascripts/serverless/store/getters_spec.js create mode 100644 spec/javascripts/serverless/store/mutations_spec.js delete mode 100644 spec/javascripts/serverless/stores/serverless_store_spec.js create mode 100644 spec/javascripts/serverless/utils.js create mode 100644 spec/lib/gitlab/prometheus/queries/knative_invocation_query_spec.rb create mode 100644 spec/models/serverless/function_spec.rb diff --git a/app/assets/javascripts/serverless/components/area.vue b/app/assets/javascripts/serverless/components/area.vue new file mode 100644 index 00000000000..32c9d6eccb8 --- /dev/null +++ b/app/assets/javascripts/serverless/components/area.vue @@ -0,0 +1,146 @@ + + + diff --git a/app/assets/javascripts/serverless/components/function_details.vue b/app/assets/javascripts/serverless/components/function_details.vue index 4f89ad69129..b8906cfca4e 100644 --- a/app/assets/javascripts/serverless/components/function_details.vue +++ b/app/assets/javascripts/serverless/components/function_details.vue @@ -1,39 +1,77 @@ diff --git a/app/assets/javascripts/serverless/components/function_row.vue b/app/assets/javascripts/serverless/components/function_row.vue index 773d18781fd..4b3bb078eae 100644 --- a/app/assets/javascripts/serverless/components/function_row.vue +++ b/app/assets/javascripts/serverless/components/function_row.vue @@ -1,4 +1,5 @@ @@ -47,14 +49,16 @@ export default {
- +