Commit 9c76dd1d authored by Hiro's avatar Hiro 🏄
Browse files

Fix warnings in website userstats script

parent 5594d01a

network/website

+27 −25
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ registry = CollectorRegistry() 
network_clients_trend = Gauge('network_clients_trend', 'Current trend for relays clients on the network per node and country',

                        ['node', 'country'], registry=registry)





series = read_csv('/srv/metrics.torproject.org/metrics/shared/stats/clients.csv', header=0, parse_dates=[0])

series = series[ series.date >= datetime.utcnow() - timedelta(days=15) ]

series = series[ series.country != "??" ]
@@ -27,14 +28,14 @@ for country in countries: 
    df = series[ series.country == country ]



    # for relays clients

    d_relays = df[ df.node == 'relay' ]



    df = df [series.node == 'relay' ]



    X = [i for i in range(0, len(df))]

    if d_relays.clients.size and np.average(d_relays.clients.values) > 100:

        X = [i for i in range(0, len(d_relays))]

        X = np.reshape(X, (len(X), 1))

        value = 0

        if len(X) > 0:

        y = df.clients.values

            y = d_relays.clients.values

            model = LinearRegression()

            model.fit(X, y)

            trend = model.predict(X)
@@ -43,18 +44,19 @@ for country in countries: 
    network_clients_trend.labels(node='relay', country=country).set(value)



    # for bridges clients

    df = df [series.node == 'bridge' ]

    X = [i for i in range(0, len(df))]

    d_bridges = df[ df.node == 'bridge' ]



    if d_bridges.clients.size and np.average(d_bridges.clients.values) > 100:

        X = [i for i in range(0, len(d_bridges))]

        X = np.reshape(X, (len(X), 1))

        value = 0

        if len(X) > 0:

        y = df.clients.values

            y = d_bridges.clients.values

            model = LinearRegression()

            model.fit(X, y)

            trend = model.predict(X)

            value = (trend[len(trend)-1]-trend[0]) / trend[0] * 100





        network_clients_trend.labels(node='bridge', country=country).set(value)



write_to_textfile('/srv/metrics.torproject.org/metrics/network/metrics', registry)