From f2908696c5e98c5c213b3f3415fba4cd1570423e Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Fri, 26 Sep 2025 17:20:15 -0700 Subject: [PATCH 1/2] remove items in new tool --- src-admintool/web/index.html | 354 ------------------------------- src-common/template/navmenu.html | 75 +------ 2 files changed, 1 insertion(+), 428 deletions(-) diff --git a/src-admintool/web/index.html b/src-admintool/web/index.html index 58777a2..bc20809 100644 --- a/src-admintool/web/index.html +++ b/src-admintool/web/index.html @@ -55,34 +55,6 @@

Common Tasks

-

System Consistency

- - -

Current Jobs

- - -

Collections

- - -

ZooKeeper

- - -

System State

-

Bytes Recently Ingested

- -

Daily Build Output

-

Object Management

-
-

Campus Reports

-
-
-

Campus Collections

- -
- -
-

Campus Invoices

- -
- -
-

Campus Owners

- -
- -
-

Repository Content

- -
-

Collections Reports

-
-

Collections Counts

- -
- -
-

Collections Activity

- -
- -
-

Collections Locks

- -
- -
-

Objects Reports

-
-

Search for a specific object by ARK

-
-

Objects Local Id

- -
- -
-

Objects Versions

- -
- -
-

Objects Special Cases

- -

Merritt Internals

-
-

Merritt User Accounts

- -

Audit Service

-
-

Audit Status

- -
- -
-

Audit Activity

- -
-
-

Audit Performance

- -

Ingest Service

@@ -374,169 +218,31 @@

Ingest Service

Ingest Activity

-
-

Ingest Profiles

- -
- -
-

Ingest Counts

- -
- -
-

Ingest Folders

- -
- -
-

Replication Service

-
- -
-

Replication Activity

- -
- -
-

Replication Performance

- -
-
-

Replication Status

- -
-
-

Inventory Service

-
- -
-

Storage Service

-

Storage Configuration

-
-

Access Queues

- -

Administer Merritt

-

Manage Merritt Queues

- - -

Cleanup Merritt Queues

- - -
- -
-

Collection Creation

- - -

Manage Admin Objects

- -
-

Manage Storage Nodes

    @@ -549,66 +255,6 @@

    Manage Audit Queues

-
-

Cleanup Old Consistency Reports

- -
- -
-

Content Projects

-
- -
-

Inventory Comparison

-
    -
  • -
    - Producer Files for a Mnemonic: - - - -
    -
-

Object List UCSC

-
    -
  • -
    - Objects for a Mnemonic: - - - -
    -
-

Prune Candidate Files

-
    -
  • -
    - Prune Candidate Files for a Mnemonic: - - - -
    -
-

Change Token

- -
-
diff --git a/src-common/template/navmenu.html b/src-common/template/navmenu.html index ed9dbbe..0d198dd 100644 --- a/src-common/template/navmenu.html +++ b/src-common/template/navmenu.html @@ -18,89 +18,19 @@
- Consistency Reports - Ingest Jobs by Profile - Ingest Jobs by Profile and Batch - Ingest Batches Recent Bytes ingested by hour Recent Bytes ingested by day - last 30 days - Recent Bytes ingested by week - last year - List Collections - Daily Build Output - ZK Node Report - ZK Node Report - Keys Only - ZK Node Report: Locks - ZK Node Orphan Report - System State - LDAP Certs -
- -
- -
- Campus - Campus Collections - Campus Invoices - Campus Owners - Repository Content - Collections - Collection Counts - Collection Activity - Collections Locks - Objects - Object Files - Object Local Ids - Object Versions - Object Special Cases -
-
-
- -
- Audit - Audit Activity - Audit Performance - Audit Status - Ingest - Ingest Activity - Ingest Profiles - Ingest Counts - Ingest Folders - Inventory - Replic - Replic Activity - Replic Performance - Replic Status - Storage - Storage Configuration - Access Queues
+
- Manage Queues - Collection Creation - Manage Admin Objects Manage Storage Nodes for a Collection Storage Node Management Manage Audit Queues and Audit Status - Update Billing Database - Update Billing Database (recalcuate yesterday's totals) - Cleanup Old Consistency Reports -
-
-
- -
- Content Projects
@@ -108,13 +38,10 @@
- Merritt Admin Objects - Merritt User Accounts Merritt Servers (quick load) Merritt Servers UC3 Servers SSM Parameter Registry - OpenSearch Field Registry
From 87497abcf9d04e34c169c3709a1a34bbf5429342 Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Mon, 29 Sep 2025 09:28:43 -0700 Subject: [PATCH 2/2] re-add consistency link to new admin tool --- mysql-ruby-lambda/Gemfile.lock | 12 +++++++----- src-admintool/Gemfile.lock | 19 ++++++++++--------- src-admintool/web/index.html | 4 ++++ src-colladmin/Gemfile.lock | 27 ++++++++++++++------------- src-common/Gemfile.lock | 14 ++++++++------ src-common/template/navmenu.html | 1 + src-testdriver/Gemfile.lock | 16 ++++++++-------- 7 files changed, 52 insertions(+), 41 deletions(-) diff --git a/mysql-ruby-lambda/Gemfile.lock b/mysql-ruby-lambda/Gemfile.lock index 801a587..da7e7eb 100644 --- a/mysql-ruby-lambda/Gemfile.lock +++ b/mysql-ruby-lambda/Gemfile.lock @@ -9,10 +9,12 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.3) - json (2.13.2) + bigdecimal (3.2.3) + json (2.15.0) language_server-protocol (3.17.0.5) lint_roller (1.1.0) - mysql2 (0.5.6) + mysql2 (0.5.7) + bigdecimal parallel (1.27.0) parser (3.3.9.0) ast (~> 2.4.1) @@ -21,7 +23,7 @@ GEM racc (1.8.1) rainbow (3.1.1) regexp_parser (2.11.3) - rubocop (1.80.2) + rubocop (1.81.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -29,10 +31,10 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) ruby-progressbar (1.13.0) diff --git a/src-admintool/Gemfile.lock b/src-admintool/Gemfile.lock index 53408fc..8ca4778 100644 --- a/src-admintool/Gemfile.lock +++ b/src-admintool/Gemfile.lock @@ -10,8 +10,8 @@ GEM specs: ast (2.4.3) aws-eventstream (1.4.0) - aws-partitions (1.1159.0) - aws-sdk-core (3.232.0) + aws-partitions (1.1166.0) + aws-sdk-core (3.233.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -19,10 +19,10 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.112.0) + aws-sdk-kms (1.113.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.199.0) + aws-sdk-s3 (1.199.1) aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -31,11 +31,12 @@ GEM base64 (0.3.0) bigdecimal (3.2.3) jmespath (1.6.2) - json (2.13.2) + json (2.15.0) language_server-protocol (3.17.0.5) lint_roller (1.1.0) logger (1.7.0) - mysql2 (0.5.6) + mysql2 (0.5.7) + bigdecimal parallel (1.27.0) parser (3.3.9.0) ast (~> 2.4.1) @@ -44,7 +45,7 @@ GEM racc (1.8.1) rainbow (3.1.1) regexp_parser (2.11.3) - rubocop (1.80.2) + rubocop (1.81.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -52,10 +53,10 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) ruby-progressbar (1.13.0) diff --git a/src-admintool/web/index.html b/src-admintool/web/index.html index bc20809..a575153 100644 --- a/src-admintool/web/index.html +++ b/src-admintool/web/index.html @@ -55,6 +55,10 @@

Common Tasks

+

System Consistency

+

Bytes Recently Ingested

    diff --git a/src-colladmin/Gemfile.lock b/src-colladmin/Gemfile.lock index 31b65e8..268c4d6 100644 --- a/src-colladmin/Gemfile.lock +++ b/src-colladmin/Gemfile.lock @@ -19,8 +19,8 @@ GEM specs: ast (2.4.3) aws-eventstream (1.4.0) - aws-partitions (1.1159.0) - aws-sdk-core (3.232.0) + aws-partitions (1.1166.0) + aws-sdk-core (3.233.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -28,20 +28,20 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-ec2 (1.556.0) + aws-sdk-ec2 (1.560.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-kms (1.112.0) + aws-sdk-kms (1.113.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) aws-sdk-lambda (1.160.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.199.0) + aws-sdk-s3 (1.199.1) aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-ssm (1.202.0) + aws-sdk-ssm (1.203.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) @@ -51,19 +51,20 @@ GEM csv (3.3.5) domain_name (0.6.20240107) http-accept (1.7.0) - http-cookie (1.0.8) + http-cookie (1.1.0) domain_name (~> 0.5) jmespath (1.6.2) - json (2.13.2) + json (2.15.0) language_server-protocol (3.17.0.5) lint_roller (1.1.0) logger (1.7.0) mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0909) + mime-types-data (3.2025.0924) mini_portile2 (2.8.9) - mysql2 (0.5.6) + mysql2 (0.5.7) + bigdecimal netrc (0.11.0) nokogiri (1.18.10) mini_portile2 (~> 2.8.2) @@ -83,7 +84,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rubocop (1.80.2) + rubocop (1.81.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -91,10 +92,10 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) ruby-progressbar (1.13.0) diff --git a/src-common/Gemfile.lock b/src-common/Gemfile.lock index 27419c9..6bb72e0 100644 --- a/src-common/Gemfile.lock +++ b/src-common/Gemfile.lock @@ -10,16 +10,18 @@ GEM specs: ast (2.4.3) base64 (0.3.0) + bigdecimal (3.2.3) httpclient (2.9.0) mutex_m - json (2.13.2) + json (2.15.0) jwt (3.1.2) base64 language_server-protocol (3.17.0.5) lint_roller (1.1.0) mustache (1.1.1) mutex_m (0.3.0) - mysql2 (0.5.6) + mysql2 (0.5.7) + bigdecimal net-ldap (0.20.0) base64 ostruct @@ -32,7 +34,7 @@ GEM racc (1.8.1) rainbow (3.1.1) regexp_parser (2.11.3) - rubocop (1.80.2) + rubocop (1.81.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -40,14 +42,14 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) ruby-progressbar (1.13.0) - rubyzip (3.1.0) + rubyzip (3.1.1) unicode-display_width (3.2.0) unicode-emoji (~> 4.1) unicode-emoji (4.1.0) diff --git a/src-common/template/navmenu.html b/src-common/template/navmenu.html index 0d198dd..b22e8ab 100644 --- a/src-common/template/navmenu.html +++ b/src-common/template/navmenu.html @@ -6,6 +6,7 @@
    🏠 Admin Home + Consistency Reports {{VERTIME}} {{USERNAME}} Admin Report Descriptions diff --git a/src-testdriver/Gemfile.lock b/src-testdriver/Gemfile.lock index e87246d..e013bbd 100644 --- a/src-testdriver/Gemfile.lock +++ b/src-testdriver/Gemfile.lock @@ -10,8 +10,8 @@ GEM specs: ast (2.4.3) aws-eventstream (1.4.0) - aws-partitions (1.1159.0) - aws-sdk-core (3.232.0) + aws-partitions (1.1166.0) + aws-sdk-core (3.233.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -22,7 +22,7 @@ GEM aws-sdk-lambda (1.160.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-ssm (1.202.0) + aws-sdk-ssm (1.203.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) @@ -33,7 +33,7 @@ GEM colorize (1.1.0) diff-lcs (1.6.2) jmespath (1.6.2) - json (2.13.2) + json (2.15.0) language_server-protocol (3.17.0.5) lint_roller (1.1.0) logger (1.7.0) @@ -61,8 +61,8 @@ GEM rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.5) - rubocop (1.80.2) + rspec-support (3.13.6) + rubocop (1.81.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -70,10 +70,10 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) ruby-progressbar (1.13.0)