Index: trunk/ippMonitor/czartool/czarpoll.pl
===================================================================
--- trunk/ippMonitor/czartool/czarpoll.pl	(revision 40091)
+++ trunk/ippMonitor/czartool/czarpoll.pl	(revision 40092)
@@ -121,20 +121,26 @@
 sub updateLabels {
 
+    # this used to have a concept of labels grouped by pantasks server, but we 
+    # don't really care about that.  Just get the labels from the pantasks listed below, 
+    # and update them all into the 'stdscience' block:
+
     print "* Updating labels\n";
     # my @servers = ("stdscience", "distribution", "publishing", "update");
-    my @servers = ("stdscience", "stdscience_ws", "distribution");
+    my @servers = ("stdscience", "distribution");
+
+    my @allLabels = ();
 
     my $server = undef;
     foreach $server (@servers) {
-
         my @labels = @{$pantasks->getLabels($server)};
-        if (@labels) {
-
-            $czarDb->updateCurrentLabels($server, \@labels);
-        }
-        else {
-
-            print "WARNING: No labels to update for '$server'\n";
-        }
+	push (@allLabels, @labels);
+    }
+
+    # store them all in stdscience:
+    $server = "stdscience";
+    if (@allLabels) {
+	$czarDb->updateCurrentLabels($server, \@allLabels);
+    } else {
+	print "WARNING: No labels to update for '$server'\n";
     }
 }