Merge pull request #77 from tarantool/66-nocrud-operations

Add non-CRUD operations panels, rework "Tarantool spaces statistics" block

Author: DifferentialOrange

CHANGELOG.md

@@ -12,12 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cartridge issues metrics labels to Telegraf configuration
 - Cartridge issues panels and "Cluster overview" row
 - Network activity row and panels
+- Non-CRUD operations panels
 
 ## Changed
 - Update metrics version to 0.9.0
 - Separate app cluster and load generator in example docker stand
 - Use cartridge-cli to run and setup example app cluster instead of luatest
 - Group Prometheus cluster overview panels into "Cluster overview" row
+- Rework "Tarantool spaces statistics" block to "Tarantool operations statistics"
+- Use Tarantool 2.x instead of Tarantool 1.x in test app and load generator
 
 ## Fixed
 - Add missing space and replication metrics labels to Telegraf configuration

example/project/app.Dockerfile

@@ -1,4 +1,4 @@
-FROM tarantool/tarantool:1.x-centos7
+FROM tarantool/tarantool:2.x-centos7
 
 WORKDIR /app
 

example/project/generate_load.lua

@@ -140,6 +140,20 @@ local function generate_space_load(name, instance)
     end
 end
 
+local function generate_operations_load(name, instance)
+    if name:match('storage') ~= nil then
+        instance.net_box:eval([[return box.execute("VALUES ('hello');")]])
+
+        if math.random(0, 100) == 25 then
+            -- duplicate key error and read-only instance error
+            pcall(instance.net_box.space.MY_SPACE.insert, instance.net_box.space.MY_SPACE, {0, random_string(5)})
+        end
+    end
+
+    if name:match('router') ~= nil then
+        instance.net_box:eval('return true')
+    end
+end
 
 local f = fio.open('instances.yml')
 local instances = yaml.decode(f:read())
@@ -165,19 +179,17 @@ for _, instance in pairs(instances) do
     pcall(instance.net_box.eval, instance.net_box, 'return box.space.MY_SPACE:truncate()')
 end
 
+local load_generators = { generate_http_load, generate_space_load, generate_operations_load }
+
 while true do
     for name, instance in pairs(instances) do
-        local _, err = pcall(generate_http_load, name, instance)
-        if err ~= nil then
-            log.error(err)
-            fiber.sleep(1)
-        end
-
-        local _, err = pcall(generate_space_load, name, instance)
-        if err ~= nil then
-            log.error(err)
-            fiber.sleep(1)
+        for _, load_generator in ipairs(load_generators) do
+            local _, err = pcall(load_generator, name, instance)
+            if err ~= nil then
+                log.error(err)
+                fiber.sleep(1)
+            end
+            fiber.yield()
         end
-        fiber.yield()
     end
 end

example/project/load.Dockerfile

@@ -1,4 +1,4 @@
-FROM tarantool/tarantool:1.x-centos7
+FROM tarantool/tarantool:2.x-centos7
 
 WORKDIR /app
 

tarantool/dashboard.libsonnet

@@ -4,8 +4,8 @@ local cluster = import 'cluster.libsonnet';
 local http = import 'http.libsonnet';
 local memory_misc = import 'memory_misc.libsonnet';
 local net = import 'net.libsonnet';
+local operations = import 'operations.libsonnet';
 local slab = import 'slab.libsonnet';
-local space = import 'space.libsonnet';
 local row = grafana.row;
 
 {
@@ -271,11 +271,11 @@ local row = grafana.row;
       { w: 24, h: 8, x: 0, y: 69 + offset },
     )
     .addPanel(
-      row.new(title='Tarantool spaces statistics'),
+      row.new(title='Tarantool operations statistics'),
       { w: 24, h: 1, x: 0, y: 77 + offset }
     )
     .addPanel(
-      space.select_rps(
+      operations.space_select_rps(
         datasource=datasource,
         policy=policy,
         measurement=measurement,
@@ -285,7 +285,7 @@ local row = grafana.row;
       { w: 8, h: 8, x: 0, y: 78 + offset },
     )
     .addPanel(
-      space.insert_rps(
+      operations.space_insert_rps(
         datasource=datasource,
         policy=policy,
         measurement=measurement,
@@ -295,7 +295,7 @@ local row = grafana.row;
       { w: 8, h: 8, x: 8, y: 78 + offset },
     )
     .addPanel(
-      space.replace_rps(
+      operations.space_replace_rps(
         datasource=datasource,
         policy=policy,
         measurement=measurement,
@@ -305,7 +305,7 @@ local row = grafana.row;
       { w: 8, h: 8, x: 16, y: 78 + offset },
     )
     .addPanel(
-      space.upsert_rps(
+      operations.space_upsert_rps(
         datasource=datasource,
         policy=policy,
         measurement=measurement,
@@ -315,7 +315,7 @@ local row = grafana.row;
       { w: 8, h: 8, x: 0, y: 86 + offset },
     )
     .addPanel(
-      space.update_rps(
+      operations.space_update_rps(
         datasource=datasource,
         policy=policy,
         measurement=measurement,
@@ -325,13 +325,73 @@ local row = grafana.row;
       { w: 8, h: 8, x: 8, y: 86 + offset },
     )
     .addPanel(
-      space.delete_rps(
+      operations.space_delete_rps(
         datasource=datasource,
         policy=policy,
         measurement=measurement,
         job=job,
         rate_time_range=rate_time_range,
       ),
       { w: 8, h: 8, x: 16, y: 86 + offset },
+    )
+    .addPanel(
+      operations.call_rps(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+        rate_time_range=rate_time_range,
+      ),
+      { w: 8, h: 8, x: 0, y: 94 + offset },
+    )
+    .addPanel(
+      operations.eval_rps(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+        rate_time_range=rate_time_range,
+      ),
+      { w: 8, h: 8, x: 8, y: 94 + offset },
+    )
+    .addPanel(
+      operations.error_rps(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+        rate_time_range=rate_time_range,
+      ),
+      { w: 8, h: 8, x: 16, y: 94 + offset },
+    )
+    .addPanel(
+      operations.auth_rps(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+        rate_time_range=rate_time_range,
+      ),
+      { w: 8, h: 8, x: 0, y: 102 + offset },
+    )
+    .addPanel(
+      operations.SQL_prepare_rps(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+        rate_time_range=rate_time_range,
+      ),
+      { w: 8, h: 8, x: 8, y: 102 + offset },
+    )
+    .addPanel(
+      operations.SQL_execute_rps(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+        rate_time_range=rate_time_range,
+      ),
+      { w: 8, h: 8, x: 16, y: 102 + offset },
     ),
 }