diff --git a/class.osc.edu/apps/dashboard/initializers/k8s_core.rb b/class.osc.edu/apps/dashboard/initializers/k8s_core.rb deleted file mode 100644 index 09c95f7..0000000 --- a/class.osc.edu/apps/dashboard/initializers/k8s_core.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'ood_core/job/adapters/kubernetes' -require 'ood_core/job/adapters/kubernetes/helper' - -# monkey patch until https://github.com/OSC/ood_core/pull/778 is released -class OodCore::Job::Adapters::Kubernetes::Helper - def secret_info_from_json(json_data) - data = json_data.to_h[:data] || {} - - info = data.symbolize_keys.each_with_object({}) do |data_kv, hash| - hash[data_kv[0]] = Base64.decode64(data_kv[1]) - rescue - next - end - { ood_connection_info: info } - end -end \ No newline at end of file diff --git a/class.osc.edu/apps/dashboard/initializers/stats2480.rb b/class.osc.edu/apps/dashboard/initializers/stats2480.rb index 5bae25f..2d4e422 100644 --- a/class.osc.edu/apps/dashboard/initializers/stats2480.rb +++ b/class.osc.edu/apps/dashboard/initializers/stats2480.rb @@ -1,18 +1,20 @@ -def add_paths - OodFilesApp.candidate_favorite_paths.tap do |paths| - # add project space directories - projects = User.new.groups.map(&:name).grep(/^P./) - paths.concat projects.map { |p| Pathname.new("/fs/project/#{p}") } +Rails.application.config.after_initialize do + def add_paths + OodFilesApp.candidate_favorite_paths.tap do |paths| + # add project space directories + projects = User.new.groups.map(&:name).grep(/^P./) + paths.concat projects.map { |p| Pathname.new("/fs/project/#{p}") } - # add scratch space directories - paths << Pathname.new("/fs/scratch/#{User.new.name}") - paths.concat projects.map { |p| Pathname.new("/fs/scratch/#{p}") } + # add scratch space directories + paths << Pathname.new("/fs/scratch/#{User.new.name}") + paths.concat projects.map { |p| Pathname.new("/fs/scratch/#{p}") } - # add ess scratch and project directories - paths.concat projects.map { |p| Pathname.new("/fs/ess/scratch/#{p}") } - paths.concat projects.map { |p| Pathname.new("/fs/ess/#{p}") } + # add ess scratch and project directories + paths.concat projects.map { |p| Pathname.new("/fs/ess/scratch/#{p}") } + paths.concat projects.map { |p| Pathname.new("/fs/ess/#{p}") } + end end -end -fs_outage = `grep node_file_test_failure /var/lib/node_exporter/textfile_collector/autofs-file-test.prom | grep -q ' 1'; echo $?` -add_paths if fs_outage.chomp == "1" && !File.exist?('/etc/ood/config/gpfs_outage') + fs_outage = `grep node_file_test_failure /var/lib/node_exporter/textfile_collector/autofs-file-test.prom | grep -q ' 1'; echo $?` + add_paths if fs_outage.chomp == "1" && !File.exist?('/etc/ood/config/gpfs_outage') +end \ No newline at end of file