Revert unnecessary changes

Author: apata

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Make sure Docker, Elixir, Erlang and Node.js are all installed on your developme
 
 ### Start the environment
 
-1. Run `make network`, `make postgres`, `make clickhouse`, `make ch-haproxy`
+1. Run both `make postgres` and `make clickhouse`.
 2. You can set up everything with `make install`, alternatively run each command separately:
     1. Run `mix deps.get`. This will download the required Elixir dependencies.
     2. Run `mix ecto.create`. This will create the required databases in both Postgres and Clickhouse.

Makefile

@@ -21,13 +21,10 @@ install: ## Run the initial setup
 server: ## Start the web server
 	mix phx.server
 
-CH_FLAGS ?= --detach -p 8123:8123 --ulimit nofile=262144:262144 --name plausible_clickhouse --env CLICKHOUSE_SKIP_USER_SETUP=1
-
-network: ## Create a docker network for clickhouse and haproxy
-	docker network create ch-net || true
+CH_FLAGS ?= --detach -p 8123:8123 -p 9000:9000 --ulimit nofile=262144:262144 --name plausible_clickhouse --env CLICKHOUSE_SKIP_USER_SETUP=1
 
 clickhouse: ## Start a container with a recent version of clickhouse
-	docker run $(CH_FLAGS) --network ch-net --volume=$$PWD/.clickhouse_db_vol:/var/lib/clickhouse --volume=$$PWD/.clickhouse_config:/etc/clickhouse-server/config.d clickhouse/clickhouse-server:latest-alpine
+	docker run $(CH_FLAGS) --network host --volume=$$PWD/.clickhouse_db_vol:/var/lib/clickhouse --volume=$$PWD/.clickhouse_config:/etc/clickhouse-server/config.d clickhouse/clickhouse-server:latest-alpine
 
 clickhouse-client: ## Connect to clickhouse
 	docker exec -it plausible_clickhouse clickhouse-client -d plausible_events_db

config/.env.dev

@@ -1,7 +1,7 @@
 BASE_URL=http://localhost:8000
 SECURE_COOKIE=false
 DATABASE_URL=postgres://postgres:postgres@127.0.0.1:5432/plausible_dev
-CLICKHOUSE_DATABASE_URL=http://127.0.0.1:8124/plausible_events_db
+CLICKHOUSE_DATABASE_URL=http://127.0.0.1:8123/plausible_events_db
 CLICKHOUSE_MAX_BUFFER_SIZE_BYTES=1000000
 SECRET_KEY_BASE=/njrhntbycvastyvtk1zycwfm981vpo/0xrvwjjvemdakc/vsvbrevlwsc6u8rcg
 TOTP_VAULT_KEY=Q3BD4nddbkVJIPXgHuo5NthGKSIH0yesRfG05J88HIo=

config/.env.test

@@ -1,5 +1,5 @@
 DATABASE_URL=postgres://postgres:postgres@127.0.0.1:5432/plausible_test
-CLICKHOUSE_DATABASE_URL=http://127.0.0.1:8124/plausible_test
+CLICKHOUSE_DATABASE_URL=http://127.0.0.1:8123/plausible_test
 SECRET_KEY_BASE=/njrhntbycvastyvtk1zycwfm981vpo/0xrvwjjvemdakc/vsvbrevlwsc6u8rcg
 TOTP_VAULT_KEY=1Jah1HEOnCEnmBE+4/OgbJRraJIppPmYCNbZoFJboZs=
 BASE_URL=http://localhost:8000

config/runtime.exs

@@ -118,7 +118,7 @@ ch_db_url =
   get_var_from_path_or_env(
     config_dir,
     "CLICKHOUSE_DATABASE_URL",
-    "http://plausible_events_db:8124/plausible_events_db"
+    "http://plausible_events_db:8123/plausible_events_db"
   )
 
 {ingest_pool_size, ""} =

haproxy.cfg

@@ -19,8 +19,6 @@ defmodule Mix.Tasks.SendPageview do
   @default_props "{}"
   @default_queryparams ""
   @default_interactive true
-  @default_batches 1
-  @default_batch_size 1
   @options [
     ip: :string,
     user_agent: :string,
@@ -34,9 +32,7 @@ defmodule Mix.Tasks.SendPageview do
     revenue_currency: :string,
     revenue_amount: :string,
     queryparams: :string,
-    interactive: :string,
-    batches: :integer,
-    batch_size: :integer
+    interactive: :string
   ]
 
   def run(opts) do
@@ -46,28 +42,7 @@ defmodule Mix.Tasks.SendPageview do
 
     case invalid do
       [] ->
-        batches = Keyword.get(parsed, :batches, @default_batches)
-        batch_size = Keyword.get(parsed, :batch_size, @default_batch_size)
-        from_same_ip_limit = 20
-        for _ <- 1..batches do
-          batch_ips =
-            1..max(Integer.floor_div(batch_size, from_same_ip_limit), 1)
-            |> Enum.map(fn _ -> Enum.map_join(1..4, ".", fn _ -> Enum.random(1..254) end) end)
-
-          tasks =
-            1..batch_size
-            |> Enum.map(fn i ->
-              Task.async(fn ->
-                do_send_pageview(
-                  parsed
-                  |> Keyword.update(:page, "#{@default_page}#{i}", fn page -> "#{page}/#{i}" end)
-                  |> Keyword.put(:ip, Enum.random(batch_ips))
-                )
-              end)
-            end)
-
-          Task.await_many(tasks)
-        end
+        do_send_pageview(parsed)
 
       [invalid_option | _] ->
         {key, _val} = invalid_option