Merge branch 'master' into theme-update

2026-09-17 09:40:58 +00:00 · 2025-08-19 23:27:34 +08:00
parent 14b53fc1f4 74d21a7acd
commit 3ef635c977
3 changed files with 300 additions and 30 deletions
@@ -185,7 +185,7 @@ metrics:
      # SQL Query Method：oneRow, multiRow, columns
      queryType: oneRow
      # sql
-      sql: select * from sys.v_$instance
+      sql: "select * from sys.v_$instance"
      # JDBC url
      url: ^_^url^_^

@@ -246,7 +246,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: multiRow
-      sql: select file_id, file_name, tablespace_name, status, bytes / 1024 / 1024 as bytes, blocks　from dba_data_files
+      sql: "select file_id, file_name, tablespace_name, status, bytes / 1024 / 1024 as bytes, blocks　from dba_data_files"
      url: ^_^url^_^

  - name: total_sessions
@@ -273,7 +273,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: oneRow
-      sql: select count(*) as count from v$session
+      sql: "select count(*) as count from v$session"
      url: ^_^url^_^

  - name: active_sessions
@@ -300,7 +300,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: oneRow
-      sql: select count(*) as count from v$session where username is not null and status = 'ACTIVE'
+      sql: "select count(*) as count from v$session where username is not null and status = 'ACTIVE'"
      url: ^_^url^_^

  - name: background_sessions
@@ -327,7 +327,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: oneRow
-      sql: select count(*) as count from v$session where username is null
+      sql: "select count(*) as count from v$session where username is null"
      url: ^_^url^_^

  - name: connection
@@ -361,7 +361,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: oneRow
-      sql: SELECT username, count( username ) as count FROM v$session WHERE username IS NOT NULL GROUP BY username
+      sql: "SELECT username, count( username ) as count FROM v$session WHERE username IS NOT NULL GROUP BY username"
      url: ^_^url^_^

  - name: performance
@@ -411,13 +411,13 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: columns
-      sql: select metric_name, value from gv$sysmetric where metric_name = 'I/O Megabytes per Second' or  metric_name = 'User Transaction Per Sec' or metric_name = 'I/O Requests per Second'
+      sql: "select metric_name, value from gv$sysmetric where metric_name = 'I/O Megabytes per Second' or  metric_name = 'User Transaction Per Sec' or metric_name = 'I/O Requests per Second'"
      url: ^_^url^_^


  - name: percentage
    i18n:
-      zh-CN: 百分比
+      zh-CN: 表空间百分比
      en-US: Percentage
      ja-JP: パーセント
    priority: 7
@@ -499,7 +499,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: oneRow
-      sql: select count(*) as process_count from v$process
+      sql: "select count(*) as process_count from v$process"
      url: ^_^url^_^

  - name: transaction
@@ -540,7 +540,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: columns
-      sql: select metric_name, value from gv$sysmetric where metric_name = 'User Commits Per Sec' or  metric_name = 'User Rollbacks Per Sec'
+      sql: "select metric_name, value from gv$sysmetric where metric_name = 'User Commits Per Sec' or  metric_name = 'User Rollbacks Per Sec'"
      url: ^_^url^_^

  - name: wait
@@ -635,7 +635,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: columns
-      sql: select wait_class, sum(time_waited) total_wait_time from v$active_session_history where session_state = 'WAITING' GROUP BY wait_class ORDER BY total_wait_time DESC
+      sql: "select wait_class, sum(time_waited) total_wait_time from v$active_session_history where session_state = 'WAITING' GROUP BY wait_class ORDER BY total_wait_time DESC"
      url: ^_^url^_^

  - name: cpu_stats
@@ -669,7 +669,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: multiRow
-      sql: select stat_name as type, value as num from v$osstat where stat_name like '%CPU%' or stat_name like '%TIME'
+      sql: "select stat_name as type, value as num from v$osstat where stat_name like '%CPU%' or stat_name like '%TIME'"
      url: ^_^url^_^

  - name: mem_stats
@@ -703,7 +703,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: multiRow
-      sql: select stat_name as type, value as num from v$osstat where stat_name like '%BYTES'
+      sql: "select stat_name as type, value as num from v$osstat where stat_name like '%BYTES'"
      url: ^_^url^_^

  - name: cache_hit_ratio
@@ -742,7 +742,7 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: columns
-      sql: select metric_name, value from gv$sysmetric where metric_name like '%Cache Hit Ratio' order by end_time asc
+      sql: "select metric_name, value from gv$sysmetric where metric_name like '%Cache Hit Ratio' order by end_time asc"
      url: ^_^url^_^

  - name: slow_query
@@ -832,5 +832,69 @@ metrics:
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
      queryType: multiRow
-      sql: SELECT * FROM (SELECT sql_id, child_number, executions, ROUND(CASE WHEN executions = 0 THEN NULL ELSE elapsed_time / (executions*1000000) END,4) AS per_secs, cpu_time / 1000000 AS cpu_secs, buffer_gets, disk_reads, fetches, parse_calls, optimizer_cost, sql_text FROM  v$sql  ) where rownum <= 10 ORDER BY  per_secs DESC
+      sql: "SELECT * FROM (SELECT sql_id, child_number, executions, ROUND(CASE WHEN executions = 0 THEN NULL ELSE elapsed_time / (executions*1000000) END,4) AS per_secs, cpu_time / 1000000 AS cpu_secs, buffer_gets, disk_reads, fetches, parse_calls, optimizer_cost, sql_text FROM  v$sql  ) where rownum <= 10 ORDER BY  per_secs DESC"
+      url: ^_^url^_^
+
+  - name: users
+    i18n:
+      zh-CN: 用户信息
+      en-US: Users
+      ja-JP: スロークエリ
+    priority: 15
+    fields:
+      - field: username
+        type: 1
+        i18n:
+          zh-CN: 用户名
+          en-US: User Name
+          ja-JP: ユーザー名
+      - field: account_status
+        type: 1
+        i18n:
+          zh-CN: 账号状态
+          en-US: Account Status
+          ja-JP: アカウントのステータス
+      - field: lock_date
+        type: 1
+        i18n:
+          zh-CN: 锁定时间
+          en-US: Lock Date
+          ja-JP: ロック日付
+      - field: expiry_date
+        type: 1
+        i18n:
+          zh-CN: 密码失效时间
+          en-US: Password Expiry Date
+          ja-JP: パスワードの有効期限
+      - field: expiry_seconds
+        type: 0
+        i18n:
+          zh-CN: 密码剩余有效时间
+          en-US: Password Validity Period Remaining
+          ja-JP: パスワードの有効期間残り
+        unit: 秒
+      - field: created
+        type: 1
+        i18n:
+          zh-CN: 创建时间
+          en-US: Creation Date
+          ja-JP: 作成日
+      - field: authentication_type
+        type: 1
+        i18n:
+          zh-CN: 认证类型
+          en-US: Authentication Type
+          ja-JP: 認証タイプ
+    protocol: jdbc
+    jdbc:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      platform: oracle
+      username: ^_^username^_^
+      password: ^_^password^_^
+      database: ^_^database^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      queryType: multiRow
+      sql: "SELECT username,account_status,lock_date,expiry_date,ceil((expiry_date-sysdate)* 24 * 60 * 60) as expiry_seconds,created,authentication_type FROM DBA_USERS ORDER BY expiry_date ASC"
      url: ^_^url^_^
@@ -15,13 +15,13 @@ keywords: [open source monitoring tool, open source database monitoring tool, mo

 ### Configuration parameter

-|   Parameter name    |                                                                        Parameter help description                                                                         |
+|   Parameter name    | Parameter help description                                                                                                                                                |
 |---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Monitoring Host     | Monitored IPV4, IPV6 or domain name. Note⚠️Without protocol header (eg: https://, http://)                                                                                |
 | Monitoring name     | Identify the name of this monitoring. The name needs to be unique                                                                                                         |
 | Port                | Port provided by the database. The default is 1521                                                                                                                        |
 | Query timeout       | Set the timeout time when SQL query does not respond to data, unit: ms, default: 3000ms                                                                                   |
-| Database name       | Database instance name, optional                                                                                                                                          |
+| Database name       | Database instance name, optionalIf you need to use a dba user, you can fill in like "sys as sysdba".                                                                      |
 | Username            | Database connection user name, optional                                                                                                                                   |
 | Password            | Database connection password, optional                                                                                                                                    |
 | URL                 | Database connection URL，optional，If configured, the database name, user name, password and other parameters in the URL will overwrite the above configured parameters     |
@@ -36,7 +36,6 @@ keywords: [open source monitoring tool, open source database monitoring tool, mo
 |   Metric name    | Metric unit | Metric help description |
 |------------------|-------------|-------------------------|
 | database_version | none        | Database version        |
-| database_type    | none        | Database type           |
 | hostname         | none        | Host name               |
 | instance_name    | none        | Database instance name  |
 | startup_time     | none        | Database start time     |
@@ -53,13 +52,31 @@ keywords: [open source monitoring tool, open source database monitoring tool, mo
 | bytes           | MB          | Size                    |
 | blocks          | none        | Number of blocks        |

-#### Metric set：user_connect
+#### Metric set：total_sessions

 | Metric name | Metric unit |  Metric help description  |
 |-------------|-------------|---------------------------|
-| username    | none        | Username                  |
 | counts      | number      | Current connection counts |

+#### Metric set：active_sessions
+
+| Metric name | Metric unit | Metric help description |
+|-------------|-------------|-------------------------|
+| counts      | number      | Active sessions counts  |
+
+#### Metric set：background_sessions
+
+| Metric name | Metric unit | Metric help description    |
+|-------------|-------------|----------------------------|
+| counts      | number      | Background sessions counts |
+
+#### Metric set：connection
+
+| Metric name | Metric unit | Metric help description |
+|-------------|-------------|-------------------------|
+| username    | none        | User name               |
+| counts      | number      | User sessions counts    |
+
 #### Metric set：performance

 | Metric name | Metric unit |   Metric help description   |
@@ -67,3 +84,89 @@ keywords: [open source monitoring tool, open source database monitoring tool, mo
 | qps         | QPS         | I/O Requests per second     |
 | tps         | TPS         | User transaction per second |
 | mbps        | MBPS        | I/O Megabytes per second    |
+
+#### Metric set：percentage
+
+| Metric name     | Metric unit   | Metric help description |
+|-----------------|---------------|-------------------------|
+| tablespace_name | none          | Tablespace name         |
+| total           | none          | Total                   |
+| used            | none          | Used                    |
+| free            | none          | Free                    |
+| used_percentage | percentage(%) | Used Percentage         |
+| free_percentage | percentage(%) | Free Percentage         |
+
+#### Metric set：process
+
+| Metric name   | Metric unit | Metric help description |
+|---------------|-------------|-------------------------|
+| process_count | none        | Process count           |
+
+#### Metric set：transaction
+
+| Metric name | Metric unit | Metric help description |
+|-------------|-------------|-------------------------|
+| commits     | t/s         | User Commits Per Sec    |
+| rollbacks   | t/s         | User Rollbacks Per Sec  |
+
+#### Metric set：wait
+
+| Metric name          | Metric unit | Metric help description |
+|----------------------|-------------|-------------------------|
+| concurrent_wait_time | ms          | Concurrent Wait Time    |
+| commit_wait_time     | ms          | Commit Wait Time        |
+| app_wait_time        | ms          | Application Wait Time   |
+| network_wait_time    | ms          | Network Wait Time       |
+| system_io_wait_time  | ms          | System I/O Wait Time    |
+| user_io_wait_time    | ms          | User I/O Wait Time      |
+| configure_wait_time  | ms          | Configure Wait Time     |
+| scheduler_wait_time  | ms          | Scheduler Wait Time     |
+
+#### Metric set：cpu_stats
+
+| Metric name | Metric unit | Metric help description |
+|-------------|-------------|-------------------------|
+| type        | none        | Type                    |
+| num         | none        | Num                     |
+
+#### Metric set：mem_stats
+
+| Metric name | Metric unit | Metric help description |
+|-------------|-------------|-------------------------|
+| type        | none        | Type                    |
+| num         | none        | Num                     |
+
+#### Metric set：cache_hit_ratio
+
+| Metric name            | Metric unit | Metric help description |
+|------------------------|-------------|-------------------------|
+| lib_cache_hit_ratio    | none        | Library Cache Hit Ratio |
+| buffer_cache_hit_ratio | none        | Buffer Cache Hit Ratio  |
+
+#### Metric set：slow_query
+
+| Metric name    | Metric unit | Metric help description |
+|----------------|-------------|-------------------------|
+| sql_id         | none        | SQL ID                  |
+| child_number   | none        | Child Number            |
+| executions     | none        | EXECUTIONS              |
+| per_secs       | seconds     | Per Secs                |
+| cpu_secs       | seconds     | CPU Secs                |
+| buffer_gets    | none        | Buffer Gets             |
+| disk_reads     | none        | Disk Reads              |
+| fetches        | none        | Fetches                 |
+| parse_calls    | none        | Parse Calls             |
+| optimizer_cost | none        | Optimizer Cost          |
+| sql_text       | none        | SQL Text                |
+
+#### Metric set：users
+
+| Metric name         | Metric unit | Metric help description                                                                           |
+|---------------------|-------------|---------------------------------------------------------------------------------------------------|
+| username            | none        | User Name                                                                                         |
+| account_status      | none        | Account Status                                                                                    |
+| lock_date           | none        | If the account status is LOCKED, the date and time when the account was locked will be displayed. |
+| expiry_date         | none        | Password Expiry Date                                                                              |
+| expiry_seconds      | seconds     | Password Validity Period Remaining                                                                |
+| created             | none        | Creation Date                                                                                     |
+| authentication_type | none        | Authentication Type                                                                               |
@@ -15,14 +15,14 @@ keywords: [开源监控系统, 开源数据库监控, Oracle数据库监控]

 ### 配置参数

-|  参数名称  |                        参数帮助描述                        |
+| 参数名称   | 参数帮助描述                                               |
 |--------|------------------------------------------------------|
 | 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
 | 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
 | 端口     | 数据库对外提供的端口，默认为1521。                                  |
 | 查询超时时间 | 设置SQL查询未响应数据时的超时时间，单位ms毫秒，默认3000毫秒。                  |
 | 数据库名称  | 数据库实例名称，可选。                                          |
-| 用户名    | 数据库连接用户名，可选                                          |
+| 用户名    | 数据库连接用户名，可选。如果使用 sys 用户，可填写成"sys as sysdba"          |
 | 密码     | 数据库连接密码，可选                                           |
 | URL    | 数据库连接URL，可选，若配置，则URL里面的数据库名称，用户名密码等参数会覆盖上面配置的参数      |
 | 采集间隔   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
@@ -31,18 +31,17 @@ keywords: [开源监控系统, 开源数据库监控, Oracle数据库监控]

 ### 采集指标

-#### 指标集合：basic
+#### 指标集合：基本信息

 |       指标名称       | 指标单位 | 指标帮助描述  |
 |------------------|------|---------|
 | database_version | 无    | 数据库版本   |
-| database_type    | 无    | 数据库类型   |
 | hostname         | 无    | 主机名称    |
 | instance_name    | 无    | 数据库实例名称 |
 | startup_time     | 无    | 数据库启动时间 |
 | status           | 无    | 数据库状态   |

-#### 指标集合：tablespace
+#### 指标集合：表空间

 |      指标名称       | 指标单位 | 指标帮助描述  |
 |-----------------|------|---------|
@@ -51,19 +50,123 @@ keywords: [开源监控系统, 开源数据库监控, Oracle数据库监控]
 | tablespace_name | 无    | 所属表空间名称 |
 | status          | 无    | 状态      |
 | bytes           | MB   | 大小      |
-| blocks          | 无    | 区块数量    |
+| blocks          | 块    | 区块数量    |

-#### 指标集合：user_connect
+#### 指标集合：会话总数

-|   指标名称   | 指标单位 | 指标帮助描述 |
+| 指标名称  | 指标单位 | 指标帮助描述 |
+|-------|------|--------|
+| count | 无    | 总数     |
+
+#### 指标集合：活动会话
+
+| 指标名称  | 指标单位 | 指标帮助描述 |
+|-------|------|--------|
+| count | 无    | 总数     |
+
+#### 指标集合：后台会话
+
+| 指标名称  | 指标单位 | 指标帮助描述 |
+|-------|------|--------|
+| count | 无    | 总数     |
+
+#### 指标集合：连接
+
+| 指标名称     | 指标单位 | 指标帮助描述 |
 |----------|------|--------|
 | username | 无    | 用户名    |
-| counts   | 个数   | 当前连接数量 |
+| count    | 无    | 总数     |

-#### 指标集合：performance
+#### 指标集合：性能

 | 指标名称 | 指标单位 |                指标帮助描述                 |
 |------|------|---------------------------------------|
 | qps  | QPS  | I/O Requests per Second 每秒IO请求数量      |
 | tps  | TPS  | User Transaction Per Sec 每秒用户事物处理数量   |
 | mbps | MBPS | I/O Megabytes per Second 每秒 I/O 兆字节数量 |
+
+#### 指标集合：表空间百分比
+
+| 指标名称            | 指标单位   | 指标帮助描述 |
+|-----------------|--------|--------|
+| tablespace_name | 无      | 表空间名   |
+| total           | 无      | 全部     |
+| used            | 无      | 已用     |
+| free            | 无      | 空闲     |
+| used_percentage | 百分比(%) | 已用百分比  |
+| free_percentage | 百分比(%) | 空闲百分比  |
+
+#### 指标集合：进程
+
+| 指标名称          | 指标单位 | 指标帮助描述 |
+|---------------|------|--------|
+| process_count | 无    | 进程数    |
+
+#### 指标集合：事务
+
+| 指标名称      | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| commits   | t/s  | 提交数    |
+| rollbacks | t/s  | 回滚数    |
+
+#### 指标集合：等待
+
+| 指标名称                 | 指标单位   | 指标帮助描述    |
+|----------------------|--------|-----------|
+| concurrent_wait_time | 毫秒(ms) | 并发等待时间    |
+| commit_wait_time     | 毫秒(ms) | 提交等待时间    |
+| app_wait_time        | 毫秒(ms) | 应用等待时间    |
+| network_wait_time    | 毫秒(ms) | 网络等待时间    |
+| system_io_wait_time  | 毫秒(ms) | 系统I/O等待时间 |
+| user_io_wait_time    | 毫秒(ms) | 用户I/O等待时间 |
+| configure_wait_time  | 毫秒(ms) | 配置等待时间    |
+| scheduler_wait_time  | 毫秒(ms) | 调度等待时间    |
+
+#### 指标集合：CPU 状态
+
+| 指标名称 | 指标单位 | 指标帮助描述 |
+|------|------|--------|
+| type | 无    | 类型     |
+| num  | 无    | 数量     |
+
+#### 指标集合：内存状态
+
+| 指标名称 | 指标单位 | 指标帮助描述 |
+|------|------|--------|
+| type | 无    | 类型     |
+| num  | 无    | 数量     |
+
+#### 指标集合：缓存命中率
+
+| 指标名称                   | 指标单位 | 指标帮助描述   |
+|------------------------|------|----------|
+| lib_cache_hit_ratio    | 无    | 库缓存命中率   |
+| buffer_cache_hit_ratio | 无    | 缓冲区缓存命中率 |
+
+#### 指标集合：慢查询
+
+| 指标名称           | 指标单位 | 指标帮助描述 |
+|----------------|------|--------|
+| sql_id         | 无    | sql 主键 |
+| child_number   | 无    | 子编号    |
+| executions     | 次    | 执行数    |
+| per_secs       | 秒    | 每秒执行数  |
+| cpu_secs       | 秒    | 每秒 CPU |
+| buffer_gets    | 无    | 获得的缓冲区 |
+| disk_reads     | 无    | 磁盘读取   |
+| fetches        | 无    | 获取数量   |
+| parse_calls    | 无    | 解析调用   |
+| optimizer_cost | 无    | 优化器成本  |
+| sql_text       | 无    | SQL 文本 |
+
+#### 指标集合：用户信息
+
+| 指标名称                | 指标单位 | 指标帮助描述                       |
+|---------------------|------|------------------------------|
+| username            | 无    | 用户名                          |
+| account_status      | 无    | 账号状态                         |
+| lock_date           | 无    | 如果账户状态为 LOCKED，则显示锁定账户的日期和时间 |
+| expiry_date         | 无    | 密码的失效时间                      |
+| expiry_seconds      | 秒    | 密码剩余有效时间,小于 0 表示已失效          |
+| created             | 无    | 创建时间                         |
+| authentication_type | 无    | 认证类型                         |