diff --git a/app/controllers/api/connect/v3/systems/systems_controller.rb b/app/controllers/api/connect/v3/systems/systems_controller.rb index 08c60f105..f8f3b8c92 100644 --- a/app/controllers/api/connect/v3/systems/systems_controller.rb +++ b/app/controllers/api/connect/v3/systems/systems_controller.rb @@ -3,6 +3,22 @@ class Api::Connect::V3::Systems::SystemsController < Api::Connect::BaseControlle before_action :authenticate_system def update + if params[:online_at].present? + params[:online_at].each do |online_at| + dthours = online_at.split(':') + if dthours.count == 2 + begin + @system_uptime = SystemUptime.create!(system_id: @system.id, online_at_day: dthours[0], online_at_hours: dthours[1]) + logger.debug(N_("Added uptime information for system '%s'") % @system.id) + rescue ActiveRecord::RecordNotUnique + logger.debug(N_("Uptime information existing for system '%s'") % @system.id) + end + else + logger.error(N_("Uptime data is malformed '%s'") % online_at) + end + end + end + @system.hostname = params[:hostname] # Since the payload is handled by rails all values are converted to string diff --git a/app/models/system.rb b/app/models/system.rb index 1e10bbc4c..0883f7de0 100644 --- a/app/models/system.rb +++ b/app/models/system.rb @@ -6,6 +6,7 @@ class System < ApplicationRecord has_many :services, through: :activations has_many :repositories, -> { distinct }, through: :services has_many :products, -> { distinct }, through: :services + has_many :system_uptimes, dependent: :destroy validates :system_token, uniqueness: { scope: %i[login password], case_sensitive: false } diff --git a/app/models/system_uptime.rb b/app/models/system_uptime.rb new file mode 100644 index 000000000..f6bf1087b --- /dev/null +++ b/app/models/system_uptime.rb @@ -0,0 +1,7 @@ +class SystemUptime < ApplicationRecord + belongs_to :system + + validates :system_id, presence: true + validates :online_at_day, presence: true + validates :online_at_hours, presence: true +end diff --git a/db/migrate/20240111200053_create_system_uptimes.rb b/db/migrate/20240111200053_create_system_uptimes.rb new file mode 100644 index 000000000..a0545d35b --- /dev/null +++ b/db/migrate/20240111200053_create_system_uptimes.rb @@ -0,0 +1,18 @@ +class CreateSystemUptimes < ActiveRecord::Migration[6.1] + def change + safety_assured do + create_table :system_uptimes do |t| + t.bigint :system_id, null: false + t.date :online_at_day, null: false + t.column :online_at_hours, 'binary(24)', null: false + t.timestamps + end + + commit_db_transaction + + add_index :system_uptimes, %i[system_id online_at_day], unique: true, name: 'id_online_day' + + add_foreign_key :system_uptimes, :systems, column: :system_id, validate: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index a1db7d82f..6f9f2a30a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -149,6 +149,15 @@ t.index ["regcode"], name: "index_subscriptions_on_regcode" end + create_table "system_uptimes", charset: "utf8mb3", collation: "utf8mb3_general_ci", force: :cascade do |t| + t.bigint "system_id", null: false + t.date "online_at_day", null: false + t.binary "online_at_hours", limit: 24, null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["system_id", "online_at_day"], name: "id_online_day", unique: true + end + create_table "systems", charset: "utf8", force: :cascade do |t| t.string "login" t.string "password" @@ -180,4 +189,5 @@ add_foreign_key "repositories_services", "services", on_delete: :cascade add_foreign_key "services", "products" add_foreign_key "subscription_product_classes", "subscriptions", on_delete: :cascade + add_foreign_key "system_uptimes", "systems" end diff --git a/lib/suse/connect/system_serializer.rb b/lib/suse/connect/system_serializer.rb index 950139c96..3e1b10fcc 100644 --- a/lib/suse/connect/system_serializer.rb +++ b/lib/suse/connect/system_serializer.rb @@ -18,6 +18,7 @@ class SUSE::Connect::SystemSerializer < ActiveModel::Serializer attribute :hostname, if: :needs_full_update? attribute :hwinfo, if: :has_hwinfo_and_needs_full_update? attribute :products, if: :needs_full_update? + attribute :online_at, if: :has_system_uptime? # We send the internal system id as system_token if the system (in RMT) is # duplicated (therefore using the system_token mechanism). @@ -47,6 +48,16 @@ def products end end + def online_at + object.system_uptimes.map do |system_uptime| + payload = { + online_at_day: system_uptime.online_at_day, + online_at_hours: system_uptime.online_at_hours + } + payload + end + end + def hwinfo JSON.parse(object.system_information).symbolize_keys end @@ -59,6 +70,10 @@ def has_system_token? object.system_token.present? end + def has_system_uptime? + online_at.present? + end + def needs_full_update? !object.scc_synced_at end diff --git a/lib/tasks/system_uptimes.rake b/lib/tasks/system_uptimes.rake new file mode 100644 index 000000000..253f4c2b2 --- /dev/null +++ b/lib/tasks/system_uptimes.rake @@ -0,0 +1,8 @@ +namespace :db do + namespace :maintenance do + desc 'Delete all uptime tracking data which are older than 90 days' + task cleanup_uptime_tracking: :environment do + SystemUptime.where("online_at_day < '#{90.days.ago}'").delete_all + end + end +end diff --git a/package/files/systemd/rmt-uptime-cleanup.service b/package/files/systemd/rmt-uptime-cleanup.service new file mode 100644 index 000000000..cce384e23 --- /dev/null +++ b/package/files/systemd/rmt-uptime-cleanup.service @@ -0,0 +1,12 @@ +[Unit] +Description=RMT uptime cleanup service +Requires=mysql.service +Wants=rmt-uptime-cleanup.timer + +[Service] +Type=oneshot +WorkingDirectory=/usr/share/rmt/bin +ExecStart=bundle exec rake db:maintenance:cleanup_uptime_tracking RAILS_ENV=production + +[Install] +WantedBy=multi-user.target diff --git a/package/files/systemd/rmt-uptime-cleanup.timer b/package/files/systemd/rmt-uptime-cleanup.timer new file mode 100644 index 000000000..b2186eb83 --- /dev/null +++ b/package/files/systemd/rmt-uptime-cleanup.timer @@ -0,0 +1,10 @@ +[Unit] +Description=RMT Uptime Data cleanup timer + +[Timer] +# Run this timer every day at a randomized 24h delay. +OnCalendar=weekly +RandomizedDelaySec=24h + +[Install] +WantedBy=timers.target diff --git a/package/obs/rmt-server.changes b/package/obs/rmt-server.changes index 170ce8eb5..f4c9d68d5 100644 --- a/package/obs/rmt-server.changes +++ b/package/obs/rmt-server.changes @@ -3,6 +3,14 @@ Thu April 18 09:27:00 UTC 2024 - Adnilson Delgado - Version 2.17 : * Improve CLI mirroring summary information by adding the mirror repositories, the file count and size. This fixes issue #702. +------------------------------------------------------------------- +Thu April 17 15:22:00 UTC 2024 - Yogalakshmi Arunachalam + +- Adding Uptime tracking capability + * Uptime data is included in the data sent to SCC via RMT + * https://jira.suse.com/browse/PED-7982 + * https://jira.suse.com/browse/PED-8018 + ------------------------------------------------------------------- Thu April 11 15:22:00 UTC 2024 - Felix Schnizlein @@ -12,6 +20,18 @@ Thu April 11 15:22:00 UTC 2024 - Felix Schnizlein directories are obsolete and can be removed savely. * Add support for debian repositories using flat or nested structures (jsc#PED-3684) +------------------------------------------------------------------- +Thu April 07 13:23:00 UTC 2024 - Felix Schnizlein + +- Version 2.16 (unreleased): + * Support bzip2 compressed repositories (bsc#1222122) + +------------------------------------------------------------------- +Thu Mar 07 15:33:00 UTC 2024 - Likhitha Priya + +- Version 2.16: + * Add support for debian repositories using flat or nested structures + ------------------------------------------------------------------- Wed Oct 04 13:23:00 UTC 2023 - Felix Schnizlein diff --git a/package/obs/rmt-server.spec b/package/obs/rmt-server.spec index 72b032203..931e7a0a0 100644 --- a/package/obs/rmt-server.spec +++ b/package/obs/rmt-server.spec @@ -1,7 +1,7 @@ # # spec file for package rmt-server # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -149,6 +149,7 @@ mkdir -p %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server-mirror.timer %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server-sync.timer %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server-systems-scc-sync.timer %{buildroot}%{_unitdir} +install -m 444 package/files/systemd/rmt-uptime-cleanup.timer %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server-mirror.service %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server-sync.service %{buildroot}%{_unitdir} @@ -156,6 +157,7 @@ install -m 444 package/files/systemd/rmt-server-systems-scc-sync.service %{build install -m 444 package/files/systemd/rmt-server.service %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server.target %{buildroot}%{_unitdir} install -m 444 package/files/systemd/rmt-server-migration.service %{buildroot}%{_unitdir} +install -m 444 package/files/systemd/rmt-uptime-cleanup.service %{buildroot}%{_unitdir} install -m 444 engines/registration_sharing/package/rmt-server-regsharing.service %{buildroot}%{_unitdir} install -m 444 engines/registration_sharing/package/rmt-server-regsharing.timer %{buildroot}%{_unitdir} @@ -168,6 +170,7 @@ ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-migration ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-mirror ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-sync ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-systems-scc-sync +ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-uptime-cleanup ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-regsharing ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-trim-cache @@ -274,6 +277,7 @@ chrpath -d %{buildroot}%{lib_dir}/vendor/bundle/ruby/*/extensions/*/*/mysql2-*/m %{_sbindir}/rcrmt-server-sync %{_sbindir}/rcrmt-server-mirror %{_sbindir}/rcrmt-server-systems-scc-sync +%{_sbindir}/rcrmt-uptime-cleanup %{_unitdir}/rmt-server.target %{_unitdir}/rmt-server.service %{_unitdir}/rmt-server-migration.service @@ -283,6 +287,8 @@ chrpath -d %{buildroot}%{lib_dir}/vendor/bundle/ruby/*/extensions/*/*/mysql2-*/m %{_unitdir}/rmt-server-sync.timer %{_unitdir}/rmt-server-systems-scc-sync.service %{_unitdir}/rmt-server-systems-scc-sync.timer +%{_unitdir}/rmt-uptime-cleanup.service +%{_unitdir}/rmt-uptime-cleanup.timer %dir %{_datadir}/bash-completion/ %dir %{_datadir}/bash-completion/completions/ %{_datadir}/bash-completion/completions/rmt-cli @@ -323,10 +329,10 @@ getent group %{rmt_group} >/dev/null || %{_sbindir}/groupadd -r %{rmt_group} getent passwd %{rmt_user} >/dev/null || \ %{_sbindir}/useradd -g %{rmt_group} -s /bin/false -r \ -c "user for RMT" %{rmt_user} -%service_add_pre rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service +%service_add_pre rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service rmt-uptime-cleanup.service %post -%service_add_post rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service +%service_add_post rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service rmt-uptime-cleanup.service # Run only on install if [ $1 -eq 1 ]; then @@ -359,10 +365,10 @@ if [ ! -e %{_datadir}/rmt/public/suma ]; then fi %preun -%service_del_preun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service +%service_del_preun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service rmt-uptime-cleanup.service %postun -%service_del_postun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service +%service_del_postun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service rmt-server-systems-scc-sync.service rmt-uptime-cleanup.service %posttrans config # Don't fail if either systemd or nginx are not running diff --git a/spec/factories/system_uptimes.rb b/spec/factories/system_uptimes.rb new file mode 100644 index 000000000..fc7c976c2 --- /dev/null +++ b/spec/factories/system_uptimes.rb @@ -0,0 +1,7 @@ +FactoryBot.define do + factory :system_uptime do + association :system + sequence(:online_at_day) { Time.zone.now } + online_at_hours { '111111111111111111111111' } + end +end diff --git a/spec/factories/systems.rb b/spec/factories/systems.rb index 53cf16ff0..d826bb0f3 100644 --- a/spec/factories/systems.rb +++ b/spec/factories/systems.rb @@ -65,5 +65,11 @@ trait :with_system_token do sequence(:system_token) { |n| "00000000-0000-4000-9000-#{n.to_s.rjust(12, '0')}" } end + + trait :with_system_uptimes do + after :create do |system, _| + create(:system_uptime, system: system) + end + end end end diff --git a/spec/lib/suse/connect/system_serializer_spec.rb b/spec/lib/suse/connect/system_serializer_spec.rb index a77bd7fab..76887e12c 100644 --- a/spec/lib/suse/connect/system_serializer_spec.rb +++ b/spec/lib/suse/connect/system_serializer_spec.rb @@ -86,4 +86,13 @@ expect(serializer.key? :system_token).to eq(false) end end + + context 'system with systemuptime' do + let(:system) { create :system, :with_system_uptimes } + + it 'match systemuptime data' do + expect((serializer[:online_at][0][:online_at_day]).to_date).to eq(Time.zone.now.to_date) + expect((serializer[:online_at][0][:online_at_hours]).to_s).to eq('111111111111111111111111') + end + end end diff --git a/spec/models/system_uptime_spec.rb b/spec/models/system_uptime_spec.rb new file mode 100644 index 000000000..84d2c2f68 --- /dev/null +++ b/spec/models/system_uptime_spec.rb @@ -0,0 +1,7 @@ +require 'rails_helper' + +RSpec.describe SystemUptime, type: :model do + it { is_expected.to validate_presence_of(:system_id) } + it { is_expected.to validate_presence_of(:online_at_day) } + it { is_expected.to validate_presence_of(:online_at_hours) } +end diff --git a/spec/requests/api/connect/v3/systems/systems_controller_spec.rb b/spec/requests/api/connect/v3/systems/systems_controller_spec.rb index f029c5dff..e00793c7a 100644 --- a/spec/requests/api/connect/v3/systems/systems_controller_spec.rb +++ b/spec/requests/api/connect/v3/systems/systems_controller_spec.rb @@ -18,6 +18,8 @@ } end let(:payload) { { hostname: 'test', hwinfo: hwinfo } } + let(:system_uptime) { system.system_uptimes.first } + let(:online_hours) { ':111111111111111111111111' } describe '#update' do subject(:update_action) { put url, params: payload, headers: headers } @@ -45,6 +47,41 @@ expect(information[:cpus]).to eq('16') end end + + context 'when uptime data provided' do + let(:payload) { { hostname: 'test', hwinfo: hwinfo, online_at: [1.day.ago.to_date.to_s << online_hours] } } + + it 'inserts the uptime data in system_uptimes table' do + update_action + + expect(system_uptime.system_id).to eq(system.reload.id) + expect(system_uptime.online_at_day.to_date).to eq(1.day.ago.to_date) + expect(system_uptime.online_at_hours.to_s).to eq('111111111111111111111111') + end + end + + context 'when same uptime data duplicated' do + let(:payload) { { hostname: 'test', hwinfo: hwinfo, online_at: [1.day.ago.to_date.to_s << online_hours, 1.day.ago.to_date.to_s << online_hours] } } + + it 'avoids duplication if multiple records have same data' do + update_action + + expect(system.system_uptimes.count).to eq(1) + expect(system_uptime.system_id).to eq(system.reload.id) + expect(system_uptime.online_at_day.to_date).to eq(1.day.ago.to_date) + expect(system_uptime.online_at_hours.to_s).to eq('111111111111111111111111') + end + end + + context 'when uptime data is malformed' do + let(:payload) { { hostname: 'test', hwinfo: hwinfo, online_at: [1.day.ago.to_date.to_s] } } + + it 'record is not inserted' do + update_action + + expect(system.system_uptimes.count).to eq(0) + end + end end context 'when hostname is not provided' do