diff --git a/site-modules/profile/files/stats_exporter/export-archive_counters.py b/site-modules/profile/files/stats_exporter/export-archive_counters.py
deleted file mode 100755
--- a/site-modules/profile/files/stats_exporter/export-archive_counters.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/python3
-
-import requests
-import json
-import time
-
-def clean_item(item):
-    """Javascript expects timestamps to be in milliseconds
-       and counter values as floats
-
-    """
-    timestamp = int(item[0])
-    counter_value = item[1]
-    return [timestamp*1000, float(counter_value)]
-    
-
-def get_timestamp_history(label):
-    result = []
-    rrd_data = []
-    now = int(time.time())
-    url = 'http://pergamon.internal.softwareheritage.org:9090/api/v1/query_range?'
-    url = url + 'query=sum(sql_swh_archive_object_count{object_type="%s"})' % label
-    url = url + '&start=1544543227&end=%s&step=12h' % now
-
-    # We only want to process timevalues for Source files
-    if (label == "content"):
-        # Historical data has already been processed for javascript usage
-        # No need to clean it further
-        with open("/usr/local/share/swh-data/history-counters.munin.json", "r") as f:
-            rrd_data = json.load(f)[label]
-
-    response = requests.get(url)
-    if response.ok:
-        data = response.json()
-        # In contrast, Prometheus-provided data has to be adapted to
-        # Javascript expectations
-        result = [clean_item(i) for i in
-            data['data']['result'][0]['values']]
-    return rrd_data + result
-
-
-def main():
-   result = {}
-   for label in ['content', 'origin', 'revision']:
-       result[label] = get_timestamp_history(label)
-   return result
-    
-
-if __name__ == '__main__':
-    r = main()
-    print(json.dumps(r))
diff --git a/site-modules/profile/files/stats_exporter/export_archive_counters.py b/site-modules/profile/files/stats_exporter/export_archive_counters.py
new file mode 100755
--- /dev/null
+++ b/site-modules/profile/files/stats_exporter/export_archive_counters.py
@@ -0,0 +1,118 @@
+#!/usr/bin/python3
+
+import requests
+import json
+import time
+
+import click
+
+
+def adapt_format(item):
+    """Javascript expects timestamps to be in milliseconds
+       and counter values as floats
+
+    Args
+        item (list): List of 2 elements, timestamp and counter
+
+    Return:
+        Normalized tuple (timestamp in js expected time, counter as float)
+
+    """
+    timestamp = int(item[0])
+    counter_value = item[1]
+    return [timestamp*1000, float(counter_value)]
+
+
+def compute_url(server, port, label):
+    """Compute the api url to request data from, specific to a label.
+
+    Args:
+        server (str): Prometheus server
+        port (int): Prometheus server port
+        label (str): object_type/label data
+
+    Returns:
+        The api url to fetch the label's data
+
+    """
+    now = int(time.time())
+    url = 'http://%s:%s/api/v1/query_range?query=sum(sql_swh_archive_object_count{object_type="%s"})&start=1544543227&end=%s&step=12h' % (server, port, label, now)  # noqa
+    return url
+
+
+def history_data(history_data_file):
+    """Retrieve the history from the history_data_file
+
+    Args:
+        history_data_file (str): Path to history file to load from
+
+    Returns:
+        dict with key (label in origin, revision, content), values (list of
+        history points: timestamp, counter):
+
+    """
+    with open(history_data_file, "r") as f:
+        return json.load(f)
+
+
+def get_timestamp_history(server, port, label):
+    """Given a label, retrieve its associated graph data.
+
+    Args:
+        server (str): Prometheus server
+        port (int): Prometheus server port
+        label (str): Label object in {content, origin, revision}
+
+    Returns:
+        The label's graph data from the prometheur server:port.
+
+    """
+    result = []
+    url = compute_url(server, port, label)
+    response = requests.get(url)
+    if response.ok:
+        data = response.json()
+        # data answer format:
+        # {"status":"success","data":{"result":[{"values":[[1544586427,"5375557897"]...  # noqa
+        # Prometheus-provided data has to be adapted to js expectations
+        result = [adapt_format(i) for i in
+            data['data']['result'][0]['values']]
+    return result
+
+
+@click.command()
+@click.option('--server', '-s',
+              default='pergamon.internal.softwareheritage.org',
+              help="Prometheus instance")
+@click.option('--port', '-p',
+              default=9090,
+              type=click.INT,
+              help='Prometheus instance service port')
+@click.option('--history-data-file', '-d',
+              default="/usr/local/share/swh-data/history-counters.munin.json",
+              type=click.Path(exists=True),
+              help="History data file with data types to reuse")
+def main(server, port, history_data_file):
+    """Compute the history graph data for the label/object_type {content,
+    revision, origin}.
+
+    This retrieves data from prometheus' sql exporter (and adapt them to the
+    expected format of the flot library we use).
+
+    For content, that also retrieves old data fetched from a previous data file
+    and aggregates it to the new prometheus data.
+
+    """
+    result = {}
+    hist_data = history_data(history_data_file)
+    # for content, we retrieve existing data and merges with the new one
+    content_data = get_timestamp_history(server, port, 'content')
+    result['content'] = hist_data['content'] + content_data
+    for label in ['origin', 'revision']:
+        result[label] = get_timestamp_history(server, port, label)
+
+    print(json.dumps(result))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/site-modules/profile/manifests/export_archive_counters.pp b/site-modules/profile/manifests/export_archive_counters.pp
--- a/site-modules/profile/manifests/export_archive_counters.pp
+++ b/site-modules/profile/manifests/export_archive_counters.pp
@@ -3,41 +3,50 @@
   $export_path = lookup('stats_export::export_path')
   $export_file = lookup('stats_export::export_file')
 
-  $packages = ['python3-click']
+  $packages = ['python3-click', 'python3-requests']
 
   package {$packages:
     ensure => present,
   }
 
-  file {'/usr/local/bin/export-archive_counters.py':
+  $script_name = 'export_archive_counters.py'
+  $script_path = "/usr/local/bin/${script_name}"
+
+  file {$script_path:
     ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0755',
-    source  => 'puppet:///modules/profile/stats_exporter/export-archive_counters.py',
+    source  => "puppet:///modules/profile/stats_exporter/${script_name}",
     require => Package[$packages],
   }
 
-  file {'/usr/local/share/swh-data/history-counters.munin.json':
+  $history_data_name = 'history-counters.munin.json'
+  $history_data_path = "/usr/local/share/swh-data/${history_data_name}"
+  file {$history_data_path:
     ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    source  => 'puppet:///modules/profile/stats_exporter/history-counters.munin.json',
+    source  => "puppet:///modules/profile/stats_exporter/${history_data_name}",
   }
 
+  $server = "pergamon.internal.softwareheritage.org"
+  $port = 9090
+
+  $command_get_data = "${script_path} --server ${server} --port ${port} --history-data-file ${history_data_path}"
   cron {'stats_export':
     ensure   => present,
     user     => 'www-data',
-    command  => "/usr/local/bin/export-archive_counters.py > ${export_file}.tmp && /bin/mv ${export_file}.tmp ${export_file}",
+    command  => "${command_get_data} > ${export_file}.tmp && /bin/mv ${export_file}.tmp ${export_file}",
     hour     => fqdn_rand(24, 'stats_export_hour'),
     minute   => fqdn_rand(60, 'stats_export_minute'),
     month    => '*',
     monthday => '*',
     weekday  => '*',
     require  => [
-      File['/usr/local/bin/export-archive_counters.py'],
-      File['/usr/local/share/swh-data/history-counters.munin.json'],
+      File[$script_path],
+      File[$history_data_path],
     ],
   }
 }