Remove unused columns. Add resource restrictions to XSEDE job ingesto…

…r. (#88)
ubccr · Apr 6, 2017 · 4c465bb · 4c465bb
1 parent e41d9c3
commit 4c465bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git a/configuration/etl/etl.d/jobs_hpc.json b/configuration/etl/etl.d/jobs_hpc.json
@@ -120,6 +120,8 @@
             "enabled": true,
             "truncate_destination": false,
             "table_prefix": "jobfact_by_",
+            "#": "Be sure to exclude the same resources as the ingestor or their records will be deleted here",
+            "exclude_resource_codes": ["OSG", "TACC-WRANGLER"],
             "aggregation_units": ["day", "month", "quarter", "year"]
         }
     ]

diff --git a/configuration/etl/etl_tables.d/jobs/jobfact_hpc_aggregation.json b/configuration/etl/etl_tables.d/jobs/jobfact_hpc_aggregation.json
@@ -208,31 +208,6 @@
                 "type": "decimal(18,0)",
                 "nullable": true,
                 "comment": "FACT: The amount of local SUs charged to jobs pertaining to this day. If a job took more than one day, its local_charge is distributed linearly across the days it used."
-            },{
-                "name": "task_local_charge_xdsu",
-                "type": "decimal(18,0)",
-                "nullable": true,
-                "comment": "FACT: The amount of XDSUs charged to jobs pertaining to this day. If a job took more than one day, its local_charge is distributed linearly across the days it used."
-            },{
-                "name": "task_local_charge_nu",
-                "type": "decimal(18,0)",
-                "nullable": true,
-                "comment": "FACT: The amount of NUs charged to jobs pertaining to this day. If a job took more than one day, its local_charge is distributed linearly across the days it used."
-            },{
-                "name": "task_adjusted_charge_su",
-                "type": "decimal(18,0)",
-                "nullable": true,
-                "comment": "FACT: The amount of local SUs charged to jobs pertaining to this day. If a job took more than one day, its local_charge is distributed linearly across the days it used."
-            },{
-                "name": "task_adjusted_charge_xdsu",
-                "type": "decimal(18,0)",
-                "nullable": true,
-                "comment": "FACT: The amount of XDSUs charged to jobs pertaining to this day. If a job took more than one day, its local_charge is distributed linearly across the days it used."
-            },{
-                "name": "task_adjusted_charge_nu",
-                "type": "decimal(18,0)",
-                "nullable": true,
-                "comment": "FACT: The amount of NUs charged to jobs pertaining to this day. If a job took more than one day, its local_charge is distributed linearly across the days it used."
             },{
                 "name": "sum_local_charge_xdsu_squared",
                 "type": "decimal(36,4)",